diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/activities/LauncherActivity.kt b/app/src/main/java/com/javinator9889/handwashingreminder/activities/LauncherActivity.kt
index 8698296..ea77137 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/activities/LauncherActivity.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/activities/LauncherActivity.kt
@@ -96,6 +96,7 @@ class LauncherActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.splash_screen)
+        progressBar.show()
     }
 
     private suspend fun displayWelcomeScreen() {
@@ -179,11 +180,12 @@ class LauncherActivity : AppCompatActivity() {
 
     override fun finish() {
         Timber.d("Calling finish")
+        progressBar.hide()
         super.finish()
     }
 
     private fun installRequiredModules() {
-        val modules = ArrayList<String>(MODULE_COUNT)
+        val modules = mutableListOf<String>()
         val googleApi = GoogleApiAvailability.getInstance()
         if (sharedPreferences.getBoolean(ADS_ENABLED, true))
             modules += Ads.MODULE_NAME
@@ -201,7 +203,6 @@ class LauncherActivity : AppCompatActivity() {
             with(SplitInstallManagerFactory.create(this)) {
                 deferredUninstall(listOf(BundledEmoji.MODULE_NAME))
             }
-        modules.trimToSize()
         val intent = if (launchOnInstall) {
             createDynamicFeatureActivityIntent(
                 modules.toTypedArray(),
@@ -246,19 +247,15 @@ class LauncherActivity : AppCompatActivity() {
         Timber.d("Firebase initialized correctly")
         Timber.d("Initializing Iconics")
         Iconics.init(this)
-//        Timber.d("Setting-up security providers")
-//        Security.insertProviderAt(Conscrypt.newProvider(), 1)
         Timber.d("Setting-up activity recognition")
         val activityHandler = ActivityHandler.getInstance(this)
         if (sharedPreferences.getBoolean(
-                Preferences.ACTIVITY_TRACKING_ENABLED, false
-            ) && with(GoogleApiAvailability.getInstance()) {
-                isGooglePlayServicesAvailable(this@LauncherActivity) ==
-                        ConnectionResult.SUCCESS
-            }
+                Preferences.ACTIVITY_TRACKING_ENABLED, false)
         ) {
+            Timber.d("Tracking is enabled and Play Services are available so starting tracking")
             activityHandler.startTrackingActivity()
         } else {
+            Timber.d("Tracking is not enabled or Play Services are not available so starting tracking")
             activityHandler.disableActivityTracker()
         }
         with(AlarmHandler(this)) {
diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/activities/MainActivity.kt b/app/src/main/java/com/javinator9889/handwashingreminder/activities/MainActivity.kt
index 59c306d..7a5b0b6 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/activities/MainActivity.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/activities/MainActivity.kt
@@ -117,6 +117,8 @@ class MainActivity : ActionBarBase(),
     override fun finish() {
         try {
             Auth.logout()
+        } catch (e: IllegalStateException) {
+          Timber.w(e, "Auth client was not initialized")
         } finally {
             super.finish()
         }
diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt b/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt
index c6d69c0..dbc255a 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/activities/views/fragments/diseases/DiseasesFragment.kt
@@ -24,7 +24,6 @@ import android.view.View
 import android.widget.LinearLayout
 import androidx.annotation.StringRes
 import androidx.core.app.ActivityCompat
-import androidx.core.view.ViewCompat
 import androidx.emoji.text.EmojiCompat
 import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
@@ -85,7 +84,6 @@ class DiseasesFragment : BaseFragmentView(), LayoutVisibilityChange {
             loading.visibility = View.VISIBLE
             countLoader.visibility = View.VISIBLE
             informationViewModel.parsedHTMLText.observe(viewLifecycleOwner) {
-                Timber.d("Parsed HTML text changed - $it | ${it.isEmpty()}")
                     if (it.isEmpty())
                         return@observe
                     parsedHTMLTexts = it
@@ -158,10 +156,6 @@ class DiseasesFragment : BaseFragmentView(), LayoutVisibilityChange {
         view.countChart.axisRight.setDrawGridLines(false)
         view.countChart.xAxis.setDrawGridLines(false)
         view.countChart.invalidate()
-        ViewCompat.setElevation(
-            view.contentLayout,
-            resources.getDimension(R.dimen.menu_elevation)
-        )
         view.countUpButton.setOnClickListener {
             lifecycleScope.launch {
                 val createdItem =
diff --git a/app/src/main/java/com/javinator9889/handwashingreminder/data/SettingsLoader.kt b/app/src/main/java/com/javinator9889/handwashingreminder/data/SettingsLoader.kt
index e24be12..9120a58 100644
--- a/app/src/main/java/com/javinator9889/handwashingreminder/data/SettingsLoader.kt
+++ b/app/src/main/java/com/javinator9889/handwashingreminder/data/SettingsLoader.kt
@@ -36,6 +36,7 @@ import com.javinator9889.handwashingreminder.activities.PrivacyTermsActivity
 import com.javinator9889.handwashingreminder.activities.views.fragments.settings.SettingsView
 import com.javinator9889.handwashingreminder.activities.views.fragments.settings.TimePickerPreference
 import com.javinator9889.handwashingreminder.emoji.EmojiLoader
+import com.javinator9889.handwashingreminder.jobs.alarms.Alarms
 import com.javinator9889.handwashingreminder.utils.*
 import com.mikepenz.aboutlibraries.LibsBuilder
 import com.mikepenz.iconics.IconicsDrawable
@@ -257,7 +258,8 @@ class SettingsLoader(
                     onInitialized = ::setupTimePickerDialog,
                     onInitializedArgs = setOf(
                         "title" to getText(R.string.breakfast_pref_title),
-                        "summary" to getText(R.string.breakfast_pref_summ)
+                        "summary" to getText(R.string.breakfast_pref_summ),
+                        "alarm" to Alarms.BREAKFAST_ALARM
                     ),
                     dispatcher = Dispatchers.Main
                 ).also { deferreds.add(it) }
@@ -267,7 +269,8 @@ class SettingsLoader(
                     onInitialized = ::setupTimePickerDialog,
                     onInitializedArgs = setOf(
                         "title" to getText(R.string.lunch_pref_title),
-                        "summary" to getText(R.string.lunch_pref_summ)
+                        "summary" to getText(R.string.lunch_pref_summ),
+                        "alarm" to Alarms.LUNCH_ALARM
                     ),
                     dispatcher = Dispatchers.Main
                 ).also { deferreds.add(it) }
@@ -277,7 +280,8 @@ class SettingsLoader(
                     onInitialized = ::setupTimePickerDialog,
                     onInitializedArgs = setOf(
                         "title" to getText(R.string.dinner_pref_title),
-                        "summary" to getText(R.string.dinner_pref_summ)
+                        "summary" to getText(R.string.dinner_pref_summ),
+                        "alarm" to Alarms.DINNER_ALARM
                     ),
                     dispatcher = Dispatchers.Main
                 ).also { deferreds.add(it) }
@@ -321,12 +325,14 @@ class SettingsLoader(
             return
         var title: CharSequence? = null
         var summary: CharSequence? = null
+        var alarm: Alarms? = null
         for (arg in args)
             when (arg.first) {
                 "title" -> title = arg.second as CharSequence
                 "summary" -> summary = arg.second as CharSequence
+                "alarm" -> alarm = arg.second as Alarms
             }
-        if (title == null || summary == null)
+        if (title == null || summary == null || alarm == null)
             return
         if (!::emojiCompat.isInitialized)
             emojiCompat = emojiLoader.await()
@@ -338,6 +344,7 @@ class SettingsLoader(
             preference.title = title
             preference.summaryText = summary
         } finally {
+            preference.alarm = alarm
             preference.updateSummary()
         }
     }
diff --git a/app/src/main/res/drawable/shadowed_divider.xml b/app/src/main/res/drawable/shadowed_divider.xml
index e13f54f..c7c3a90 100644
--- a/app/src/main/res/drawable/shadowed_divider.xml
+++ b/app/src/main/res/drawable/shadowed_divider.xml
@@ -7,7 +7,7 @@
             <corners android:topLeftRadius="16dp" android:topRightRadius="16dp" />
         </shape>
     </item>
-    <item android:top="1dp">
+    <item android:top="2dp">
         <shape android:shape="rectangle">
             <solid android:color="@android:color/white" />
             <corners android:topLeftRadius="16dp" android:topRightRadius="16dp" />
diff --git a/app/src/main/res/layout/main_disease_view.xml b/app/src/main/res/layout/main_disease_view.xml
index e5e2822..cc32275 100644
--- a/app/src/main/res/layout/main_disease_view.xml
+++ b/app/src/main/res/layout/main_disease_view.xml
@@ -4,16 +4,16 @@
     android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:clipToPadding="false"
-    android:animateLayoutChanges="true">
+    android:animateLayoutChanges="true"
+    android:clipToPadding="false">
 
     <LinearLayout
         android:id="@+id/handwashingLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_marginBottom="60dp"
         android:background="@android:color/white"
-        android:orientation="vertical"
-        android:layout_marginBottom="32dp">
+        android:orientation="vertical">
 
         <include layout="@layout/handwash_count" />
     </LinearLayout>
@@ -23,22 +23,22 @@
         android:id="@+id/contentLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
+        android:layout_above="@+id/handwashingLayout"
         android:background="@android:color/white"
         android:clipToPadding="false"
-        android:layout_above="@+id/handwashingLayout"
-        app:behavior_peekHeight="32dp"
+        android:orientation="vertical"
+        app:behavior_peekHeight="65dp"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <LinearLayout
             android:id="@+id/backdrop"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="65dp"
             android:background="@drawable/shadowed_divider"
             android:clickable="true"
             android:focusable="true"
             android:gravity="center"
-            android:orientation="horizontal"
+            android:orientation="vertical"
             android:padding="16dp">
 
             <!--        <View style="@style/Divider" />-->
@@ -47,6 +47,17 @@
                 android:layout_height="4dp"
                 android:background="@drawable/divider_shape" />
 
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/diseaseInformationHeader"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:fontFamily="@font/raleway_bold"
+                android:gravity="center"
+                android:layout_marginTop="8dp"
+                android:text="@string/diseases_info"
+                android:textAppearance="@style/TextAppearance.AppCompat.Display1"
+                android:textSize="18sp" />
+
         </LinearLayout>
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
diff --git a/app/src/main/res/layout/splash_screen.xml b/app/src/main/res/layout/splash_screen.xml
index 91f5235..b3e14dd 100644
--- a/app/src/main/res/layout/splash_screen.xml
+++ b/app/src/main/res/layout/splash_screen.xml
@@ -28,6 +28,7 @@
             app:lottie_loop="false" />
 
         <TextView
+            android:id="@+id/textView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
@@ -37,9 +38,25 @@
             android:text="@string/app_name"
             android:textAppearance="@style/TextAppearance.AppCompat.Display1"
             android:textSize="30sp"
-            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/progressBar"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/logo" />
+
+        <androidx.core.widget.ContentLoadingProgressBar
+            android:id="@+id/progressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginBottom="16dp"
+            android:indeterminate="true"
+            android:visibility="visible"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 71cb93a..3f658f5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -277,4 +277,5 @@
     </plurals>
     <string name="add_another">¡Añade otra más! &#128588;</string>
     <string name="reduce_count">Bueno, quizás una menos &#128517;</string>
+    <string name="diseases_info">Información de enfermedades</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e702c2e..aedd584 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -305,4 +305,5 @@
     </plurals>
     <string name="add_another">Add another! &#128588;</string>
     <string name="reduce_count">Well, maybe one less &#128517;</string>
+    <string name="diseases_info">Diseases information</string>
 </resources>