diff --git a/app/build.gradle b/app/build.gradle
index ced48f5..19f2e3e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-  id "io.gitlab.arturbosch.detekt" version "1.0.0.RC6-4"
+    id "io.gitlab.arturbosch.detekt" version "1.0.0.RC6-4"
 }
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
@@ -8,85 +8,95 @@ apply plugin: 'kotlin-kapt'
 apply plugin: "org.jlleitschuh.gradle.ktlint"
 
 detekt {
-  version = "1.0.0.RC6-4"
-  profile("main") {
-    config = "$rootDir/config/detekt/detekt-config.yml"
-    output = "$project.projectDir/build/reports/detekt/detekt.xml"
-  }
+    version = "1.0.0.RC6-4"
+    profile("main") {
+        config = "$rootDir/config/detekt/detekt-config.yml"
+        output = "$project.projectDir/build/reports/detekt/detekt.xml"
+    }
 }
 
 android {
-  compileSdkVersion 27
-
-  defaultConfig {
-    applicationId "com.ferranpons.spacehub"
-    minSdkVersion 15
-    targetSdkVersion 27
-    versionCode 4
-    versionName "1.0"
-    multiDexEnabled true
-  }
-
-  buildTypes {
-    release {
-      minifyEnabled true
-      proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+    compileSdkVersion 27
+
+    defaultConfig {
+        applicationId "com.ferranpons.spacehub"
+        minSdkVersion 17
+        targetSdkVersion 27
+        versionCode 4
+        versionName "1.0"
+        multiDexEnabled true
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    dexOptions {
+        javaMaxHeapSize "4g"
+        preDexLibraries = preDexEnabled && !travisBuild
+    }
+
+    lintOptions {
+        abortOnError false
+        disable 'IconMissingDensityFolder'
     }
-  }
-
-  compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
-  }
-
-  dexOptions {
-    javaMaxHeapSize "4g"
-    preDexLibraries = preDexEnabled && !travisBuild
-  }
-
-  lintOptions {
-    abortOnError false
-    disable 'IconMissingDensityFolder'
-  }
 }
 
 dependencies {
-  implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+
+    implementation 'com.android.support:multidex:1.0.3'
 
-  implementation 'com.android.support:multidex:1.0.3'
+    def supportLibraryVersion = '27.1.1'
+    implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
+    implementation "com.android.support:design:${supportLibraryVersion}"
+    implementation "com.android.support:cardview-v7:$supportLibraryVersion"
+    implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
 
-  def supportLibraryVersion = '27.1.1'
-  implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
-  implementation "com.android.support:design:${supportLibraryVersion}"
-  implementation "com.android.support:cardview-v7:$supportLibraryVersion"
-  implementation "com.android.support:recyclerview-v7:$supportLibraryVersion"
-  implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    def playServicesVersion = '12.0.1'
+    implementation "com.google.android.gms:play-services-maps:$playServicesVersion"
+    implementation "com.google.firebase:firebase-crash:$playServicesVersion"
+    implementation "com.google.firebase:firebase-core:$playServicesVersion"
 
-  implementation 'com.google.android.gms:play-services-maps:12.0.1'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
 
-  implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
-  implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
+    implementation('com.schibstedspain.android:leku:4.0.1') {
+        exclude group: 'com.google.android.gms'
+        exclude group: 'com.android.support'
+    }
 
-  def butterKnife = '8.8.1'
-  implementation "com.jakewharton:butterknife:$butterKnife"
-  kapt "com.jakewharton:butterknife-compiler:$butterKnife"
+    def butterKnife = '8.8.1'
+    implementation "com.jakewharton:butterknife:$butterKnife"
+    kapt "com.jakewharton:butterknife-compiler:$butterKnife"
 
-  implementation 'net.danlew:android.joda:2.9.9.1'
+    implementation 'net.danlew:android.joda:2.9.9.1'
 
-  def retrofitVersion = '2.3.0'
-  implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
-  implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion"
-  implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"
+    def retrofitVersion = '2.3.0'
+    implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
+    implementation "com.squareup.retrofit2:adapter-rxjava2:$retrofitVersion"
+    implementation "com.squareup.retrofit2:converter-gson:$retrofitVersion"
 
-  implementation 'io.swagger:swagger-annotations:1.5.17'
-  implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
+    implementation 'io.swagger:swagger-annotations:1.5.17'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
 
-  implementation ("com.ashokvarma.android:bottom-navigation-bar:2.0.4") {
-    exclude group: 'com.android.support'
-  }
+    implementation("com.ashokvarma.android:bottom-navigation-bar:2.0.4") {
+        exclude group: 'com.android.support'
+    }
 
-  implementation 'com.google.code.gson:gson:2.8.2'
+    implementation 'com.google.code.gson:gson:2.8.2'
 
-  testImplementation 'org.mockito:mockito-core:2.12.0'
-  testImplementation 'junit:junit:4.12'
+    testImplementation 'org.mockito:mockito-core:2.12.0'
+    testImplementation 'junit:junit:4.12'
 }
+
+//apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/java/com/ferranpons/spacehub/passTimes/PassTimesAdapter.kt b/app/src/main/java/com/ferranpons/spacehub/passTimes/PassTimesAdapter.kt
index a6f51f6..5720623 100644
--- a/app/src/main/java/com/ferranpons/spacehub/passTimes/PassTimesAdapter.kt
+++ b/app/src/main/java/com/ferranpons/spacehub/passTimes/PassTimesAdapter.kt
@@ -1,60 +1,50 @@
 package com.ferranpons.spacehub.passTimes
 
-import android.annotation.TargetApi
-import android.content.Context
-import android.icu.text.SimpleDateFormat
+import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.ArrayAdapter
 import android.widget.TextView
 import com.ferranpons.spacehub.R
 import com.ferranpons.spacehub.issTracking.IssTrackingApiInterface
-import java.util.Locale
 import java.util.concurrent.TimeUnit
-import org.joda.time.DateTime
 
-class PassTimesAdapter(context: Context, passTimes: List<IssTrackingApiInterface.PassTime>) : ArrayAdapter<IssTrackingApiInterface.PassTime>(context, R.layout.row_pass_time, passTimes) {
+class PassTimesAdapter(private val passTimes: List<IssTrackingApiInterface.PassTime>) : RecyclerView.Adapter<PassTimesAdapter.PassTimesViewHolder>() {
 
-    class ViewHolder(view: View) {
-        internal var riseTime: TextView = view.findViewById(R.id.riseTime) as TextView
-        internal var duration: TextView = view.findViewById(R.id.duration) as TextView
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): PassTimesViewHolder {
+        val v = LayoutInflater.from(parent.context).inflate(R.layout.row_pass_time, parent, false)
+        return PassTimesViewHolder(v)
     }
 
-    @TargetApi(24)
-    override fun getView(position: Int, view: View?, parent: ViewGroup): View? {
-        val holder: ViewHolder
-        var customView = view
-        if (view == null) {
-            customView = View.inflate(parent.context, R.layout.row_pass_time, null)
-            holder = ViewHolder(customView)
-            customView.tag = holder
-        } else {
-            holder = view.tag as ViewHolder
-        }
-        val passTime = getItem(position)
-        if (passTime != null && passTime.riseTime > -1) {
-            val date = DateTime(passTime.riseTime * 1000L)
+    override fun getItemCount(): Int = passTimes.size
+
+    override fun onBindViewHolder(holder: PassTimesViewHolder, position: Int) {
+        val passTime = passTimes[position]
+        if (passTime.riseTime > -1) {
+            /*val date = DateTime(passTime.riseTime * 1000L)
             var sdf: SimpleDateFormat? = null
             if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
                 sdf = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault())
             }
-            var riseTimeUnformatted = arrayOfNulls<String>(0)
             if (sdf != null) {
-                riseTimeUnformatted = sdf.format(date).split(" ".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
-            }
-            val riseTime = riseTimeUnformatted[0] + " at " + riseTimeUnformatted[1] + "h"
-            holder.riseTime.text = riseTime
+                val riseTimeUnformatted = sdf.format(date).split(" ".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()
+                val riseTime = riseTimeUnformatted[0] + " at " + riseTimeUnformatted[1] + "h"
+                holder.riseTime.text = riseTime
+            }*/
         }
-        if (passTime != null && passTime.duration > -1) {
+        if (passTime.duration > -1) {
             val duration = TimeUnit.SECONDS.toMinutes(passTime.duration.toLong())
             val durationTime: String
-            if (duration >= 1) {
-                durationTime = "during " + java.lang.Long.toString(duration) + " min"
+            durationTime = if (duration >= 1) {
+                "during " + java.lang.Long.toString(duration) + " min"
             } else {
-                durationTime = "during " + Integer.toString(passTime.duration) + " secs"
+                "during " + Integer.toString(passTime.duration) + " secs"
             }
             holder.duration.text = durationTime
         }
-        return customView
+    }
+
+    inner class PassTimesViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+        var riseTime = view.findViewById(R.id.riseTime) as TextView
+        var duration = view.findViewById(R.id.duration) as TextView
     }
 }
diff --git a/app/src/main/java/com/ferranpons/spacehub/schedule/ScheduleFragment.kt b/app/src/main/java/com/ferranpons/spacehub/schedule/ScheduleFragment.kt
index 9592a01..34af163 100644
--- a/app/src/main/java/com/ferranpons/spacehub/schedule/ScheduleFragment.kt
+++ b/app/src/main/java/com/ferranpons/spacehub/schedule/ScheduleFragment.kt
@@ -3,30 +3,48 @@ package com.ferranpons.spacehub.schedule
 import android.content.Context
 import android.os.Bundle
 import android.support.v4.app.Fragment
+import android.support.v7.widget.DefaultItemAnimator
+import android.support.v7.widget.LinearLayoutManager
+import android.support.v7.widget.RecyclerView
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import com.ferranpons.spacehub.R
 import com.ferranpons.spacehub.issTracking.IssTrackingApi
 import com.ferranpons.spacehub.issTracking.IssTrackingApiInterface
+import com.ferranpons.spacehub.issTracking.IssTrackingInteractor
+import com.ferranpons.spacehub.issTracking.IssTrackingPresenter
 import com.ferranpons.spacehub.issTracking.IssTrackingPresenterInterface
 import com.ferranpons.spacehub.issTracking.IssTrackingViewInterface
-import com.ferranpons.spacehub.issTracking.IssTrackingPresenter
-import com.ferranpons.spacehub.issTracking.IssTrackingInteractor
+import com.ferranpons.spacehub.passTimes.PassTimesAdapter
 
 class ScheduleFragment : Fragment(), IssTrackingViewInterface {
     private lateinit var issTrackingPresenter: IssTrackingPresenterInterface
+    private lateinit var recyclerView: RecyclerView
+
+    companion object {
+        const val OPEN_NOTIFY_API = "http://api.open-notify.org"
+    }
 
     override fun onAttach(context: Context?) {
         super.onAttach(context)
 
-        issTrackingPresenter = IssTrackingPresenter(IssTrackingInteractor(IssTrackingApi.getIssTrackingApi("http://api.open-notify.org")))
+        issTrackingPresenter = IssTrackingPresenter(IssTrackingInteractor(IssTrackingApi.getIssTrackingApi(OPEN_NOTIFY_API)))
         (issTrackingPresenter as IssTrackingPresenter).setView(this)
     }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        val view = inflater.inflate(R.layout.fragment_schedule, container, false)
-        return view
+        return inflater.inflate(R.layout.fragment_schedule, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        val layoutManager = LinearLayoutManager(view.context)
+        recyclerView = view.findViewById(R.id.schedule_recyclerview)
+        recyclerView.layoutManager = layoutManager
+        recyclerView.setHasFixedSize(true)
+        recyclerView.itemAnimator = DefaultItemAnimator()
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -39,6 +57,7 @@ class ScheduleFragment : Fragment(), IssTrackingViewInterface {
     }
 
     override fun setIssPosition(position: IssTrackingApiInterface.IssPosition?) {
+        issTrackingPresenter.retrievePassTimes(position?.latitude!!, position.longitude)
     }
 
     override fun willRetrievePassTimes() {
@@ -60,6 +79,10 @@ class ScheduleFragment : Fragment(), IssTrackingViewInterface {
     }
 
     override fun showPassTimes(passTimes: MutableList<IssTrackingApiInterface.PassTime>?) {
+        val scheduleAdapter = PassTimesAdapter(passTimes!!)
+
+        recyclerView.adapter = scheduleAdapter
+        scheduleAdapter.notifyDataSetChanged()
     }
 
     override fun showPeopleInSpace(people: MutableList<IssTrackingApiInterface.Person>?) {
diff --git a/app/src/main/res/layout/fragment_schedule.xml b/app/src/main/res/layout/fragment_schedule.xml
index de144fa..084f537 100644
--- a/app/src/main/res/layout/fragment_schedule.xml
+++ b/app/src/main/res/layout/fragment_schedule.xml
@@ -1,8 +1,103 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
-</LinearLayout>
\ No newline at end of file
+    <android.support.design.widget.AppBarLayout
+        android:id="@+id/appbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+        app:elevation="16dp"
+        tools:ignore="UnusedAttribute"
+        >
+
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            app:layout_scrollFlags="scroll|enterAlways|snap"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="56dp"
+                    android:layout_gravity="center_vertical"
+                    android:contentDescription="@string/app_name"
+                    android:src="@mipmap/ic_launcher" />
+            </FrameLayout>
+
+        </android.support.v7.widget.Toolbar>
+    </android.support.design.widget.AppBarLayout>
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingStart="@dimen/gap2"
+        android:paddingEnd="@dimen/gap2"
+        app:layout_anchor="@+id/appbar"
+        app:layout_anchorGravity="top"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        >
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/schedule_recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            />
+
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/button_scroll_to_top"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|end"
+        android:layout_margin="@dimen/gap7"
+        app:layout_scrollFlags="scroll|enterAlways|snap"
+        app:fabSize="mini"
+        android:src="@drawable/ic_action_about"
+        android:visibility="gone"
+        tools:visibility="visible"
+        app:layout_anchor="@+id/appbar"
+        app:layout_anchorGravity="top|right|end"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        />
+
+    <TextView
+        android:id="@+id/distance_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal|top"
+        android:gravity="center|center_horizontal"
+        android:drawableStart="@drawable/ic_action_collapse_dark"
+        android:drawablePadding="@dimen/gap4"
+        android:layout_marginTop="@dimen/gap7"
+        android:minHeight="@dimen/gap11"
+        android:paddingStart="@dimen/gap5"
+        android:paddingEnd="@dimen/gap5"
+        android:paddingTop="@dimen/gap2"
+        android:paddingBottom="@dimen/gap2"
+        app:layout_scrollFlags="scroll|enterAlways|snap"
+        android:visibility="gone"
+        tools:visibility="visible"
+        app:elevation="6dp"
+        app:layout_anchor="@+id/appbar"
+        app:layout_anchorGravity="top|center"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        />
+
+    <include layout="@layout/loading_custom_view"/>
+
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/loading_custom_view.xml b/app/src/main/res/layout/loading_custom_view.xml
new file mode 100644
index 0000000..efbf65e
--- /dev/null
+++ b/app/src/main/res/layout/loading_custom_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+              xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:id="@+id/loading"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:layout_gravity="center|center_vertical"
+              android:gravity="center|center_vertical"
+              android:visibility="gone"
+              android:paddingBottom="52dp"
+              tools:visibility="visible"
+              app:layout_behavior="@string/appbar_scrolling_view_behavior"
+              tools:showIn="@layout/fragment_schedule">
+
+    <ProgressBar
+        style="?android:attr/progressBarStyle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..55b13a7
--- /dev/null
+++ b/app/src/main/res/values/dimens.xml
@@ -0,0 +1,21 @@
+<resources>
+    <!-- Default screen margins, per the Android Design guidelines. -->
+    <dimen name="activity_horizontal_margin">16dp</dimen>
+    <dimen name="activity_vertical_margin">16dp</dimen>
+
+    <dimen name="gap15">72dp</dimen>
+    <dimen name="gap14">48dp</dimen>
+    <dimen name="gap13">56dp</dimen>
+    <dimen name="gap12">40dp</dimen>
+    <dimen name="gap11">32dp</dimen>
+    <dimen name="gap10">36dp</dimen>
+    <dimen name="gap9">24dp</dimen>
+    <dimen name="gap8">20dp</dimen>
+    <dimen name="gap7">16dp</dimen>
+    <dimen name="gap6">12dp</dimen>
+    <dimen name="gap5">10dp</dimen>
+    <dimen name="gap4">8dp</dimen>
+    <dimen name="gap3">6dp</dimen>
+    <dimen name="gap2">4dp</dimen>
+    <dimen name="gap1">2dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dee0b47..55ea946 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
   <style name="AppTheme"
-         parent="Theme.AppCompat.Light.DarkActionBar">
+         parent="Theme.AppCompat.Light.NoActionBar">
     <item name="colorPrimary">#3F51B5</item>
     <item name="colorPrimaryDark">#303F9F</item>
     <item name="colorAccent">#FF5722</item>
diff --git a/build.gradle b/build.gradle
index 74db0ef..f4260e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,19 +13,20 @@ buildscript {
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     classpath 'com.github.triplet.gradle:play-publisher:1.2.0'
     classpath "gradle.plugin.org.jlleitschuh.gradle:ktlint-gradle:4.1.0"
+    //classpath 'com.google.gms:google-services:4.0.1'
   }
 }
 
 allprojects {
-  repositories {
-    jcenter()
-    mavenCentral()
-    google()
-  }
+    repositories {
+        jcenter()
+        mavenCentral()
+        google()
+    }
 }
 
 ext {
-  travisBuild = System.getenv("TRAVIS") == "true"
-  // allows for -Dpre-dex=false to be set
-  preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
+    travisBuild = System.getenv("TRAVIS") == "true"
+    // allows for -Dpre-dex=false to be set
+    preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
 }