diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index a88ded0..ce889bd 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,8 +1,5 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
-    <AndroidXmlCodeStyleSettings>
-      <option name="ARRANGEMENT_SETTINGS_MIGRATED_TO_191" value="true" />
-    </AndroidXmlCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 7ac24c7..674414f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="false" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000..d5d3f00
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,8 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="Deprecation" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="EditorConfigDeprecatedDescriptor" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="GrDeprecatedAPIUsage" enabled="false" level="WARNING" enabled_by_default="false" />
+  </profile>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0d45e8d..f5c6d9e 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml
new file mode 100644
index 0000000..8ec256a
--- /dev/null
+++ b/.idea/render.experimental.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RenderSettings">
+    <option name="showDecorations" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/app/.gitignore b/app/.gitignore
index b46299f..ae94abd 100644
--- a/app/.gitignore
+++ b/app/.gitignore
@@ -1,2 +1,3 @@
 /build
-/google-services.json
\ No newline at end of file
+/google-services.json
+app/src/main/java/com/spartahack/spartahack_android/Secrets.java
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index ed8e8a1..533af8f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,28 +32,43 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+
+    // Design
     implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.core:core-ktx:1.2.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+
+    // Async stuff
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0-RC'
-    implementation 'com.google.firebase:firebase-analytics:17.2.1'
-    implementation 'com.google.firebase:firebase-messaging:20.0.1'
+
+    // Notifications
+    implementation 'com.google.firebase:firebase-analytics:17.2.3'
+    implementation 'com.google.firebase:firebase-messaging:20.1.2'
+
+    // QR Scanner
+    implementation 'com.google.firebase:firebase-ml-vision:24.0.1'
+    implementation 'com.google.firebase:firebase-ml-vision-barcode-model:16.0.2'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.61'
+
     implementation 'com.google.android.gms:play-services-vision:19.0.0'
 
     // Auth0
     implementation 'com.auth0.android:auth0:1.+'
-    implementation 'com.android.support:support-annotations:28.0.0'
-
 
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0a43ef2..0fd8b44 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,8 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-feature android:name="android.hardware.camera" android:required="false" />
+    <uses-feature android:name="android.hardware.camera.autofocus" />
 
     <application
         android:allowBackup="true"
@@ -11,15 +13,15 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme" >
-
+        android:theme="@style/Theme.AppCompat.Light.NoActionBar" >
 
+<!--
         <activity android:name="com.auth0.samples.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity>
+        </activity>-->
 
         <activity
             android:name=".MainActivity"
@@ -27,27 +29,15 @@
             android:theme="@style/AppTheme.NoActionBar" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-                android:name=".MapsActivity"
-                android:label="@string/app_name"
-                android:theme="@style/AppTheme.NoActionBar" >
-            <intent-filter>
-                <action android:name="android.intent.action.MAPS" />
-
-                <category android:name="android.intent.category.MAPS" />
-            </intent-filter>
-        </activity>
         <activity
                 android:name=".ScheduleActivity"
                 android:label="@string/app_name"
                 android:theme="@style/AppTheme.NoActionBar" >
             <intent-filter>
                 <action android:name="android.intent.action.SCHEDULE" />
-
                 <category android:name="android.intent.category.SCHEDULE" />
             </intent-filter>
         </activity>
@@ -57,27 +47,15 @@
                 android:theme="@style/AppTheme.NoActionBar" >
             <intent-filter>
                 <action android:name="android.intent.action.FAQ" />
-
                 <category android:name="android.intent.category.FAQ" />
             </intent-filter>
         </activity>
-        <activity
-                android:name=".ProfileActivity"
-                android:label="@string/app_name"
-                android:theme="@style/AppTheme.NoActionBar" >
-            <intent-filter>
-                <action android:name="android.intent.action.PROFILE" />
-
-                <category android:name="android.intent.category.PROFILE" />
-            </intent-filter>
-        </activity>
         <activity
                 android:name=".QRScannerActivity"
                 android:label="@string/app_name"
                 android:theme="@style/AppTheme.NoActionBar" >
             <intent-filter>
                 <action android:name="android.intent.action.QRSCANNER" />
-
                 <category android:name="android.intent.category.QRSCANNER" />
             </intent-filter>
         </activity>
diff --git a/app/src/main/java/com/spartahack/spartahack_android/FAQActivity.kt b/app/src/main/java/com/spartahack/spartahack_android/FAQActivity.kt
index 8a8d168..69a17c2 100644
--- a/app/src/main/java/com/spartahack/spartahack_android/FAQActivity.kt
+++ b/app/src/main/java/com/spartahack/spartahack_android/FAQActivity.kt
@@ -13,7 +13,7 @@ import android.view.Menu
 import androidx.core.text.HtmlCompat
 import kotlinx.coroutines.*
 import kotlinx.android.synthetic.main.faq_view.*
-import com.spartahack.spartahack_android.scripts.faqMain
+import com.spartahack.spartahack_android.scripts.faqMainSuspend
 
 
 class FAQActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
@@ -21,33 +21,16 @@ class FAQActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelected
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_faq)
-        val toolbar: Toolbar = findViewById(R.id.toolbar)
-        setSupportActionBar(toolbar)
-
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        val navView: NavigationView = findViewById(R.id.nav_view)
-        val toggle = ActionBarDrawerToggle(
-                this, drawerLayout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
-        drawerLayout.addDrawerListener(toggle)
-        toggle.syncState()
-
-        navView.setNavigationItemSelectedListener(this)
+        setContentView(R.layout.faq_view)
 
         // Makes the API call and sends the data to the activity.
-        val displayString = GlobalScope.async { faqMain() }
+        val displayString = GlobalScope.async { faqMainSuspend() }
 
         runBlocking { faqTextView.text = HtmlCompat.fromHtml(displayString.await(), 0) }
     }
 
     override fun onBackPressed() {
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
-            drawerLayout.closeDrawer(GravityCompat.START)
-        } else {
-            super.onBackPressed()
-
-        }
+        super.onBackPressed()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -73,24 +56,11 @@ class FAQActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelected
                 var intent = Intent(this, MainActivity::class.java)
                 startActivity(intent)
             }
-            R.id.nav_maps -> {
-                // set activity to maps
-
-                var intent = Intent(this, MapsActivity::class.java)
-                startActivity(intent)
-            }
             R.id.nav_faq -> {
                 // already here
             }
-            R.id.nav_schedule -> {
-                // set activity to schedule
-                var intent = Intent(this, ScheduleActivity::class.java)
-                startActivity(intent)
-            }
-
         }
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        drawerLayout.closeDrawer(GravityCompat.START)
+
         return true
     }
 }
diff --git a/app/src/main/java/com/spartahack/spartahack_android/FAQFragment.kt b/app/src/main/java/com/spartahack/spartahack_android/FAQFragment.kt
new file mode 100644
index 0000000..da18761
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/FAQFragment.kt
@@ -0,0 +1,45 @@
+package com.spartahack.spartahack_android
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.text.HtmlCompat
+import androidx.fragment.app.Fragment
+import com.spartahack.spartahack_android.scripts.faqMainSuspend
+import kotlinx.android.synthetic.main.faq_view.*
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
+
+
+class FAQFragment(private val fragment_id:Int) : Fragment(fragment_id) {
+    private lateinit var faqDisplay: String
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        // Makes the API call and sends the data to the activity.
+        val displayString = GlobalScope.async { faqMainSuspend() }
+
+        // Store the string so that the API call will not have to be made again.
+        runBlocking { faqDisplay = displayString.await() }
+        super.onCreate(savedInstanceState)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?): View? {
+        return inflater.inflate(fragment_id, container, false)
+    }
+
+    override fun onStart() {
+        faqTextView.text = HtmlCompat.fromHtml(faqDisplay, 0)
+        super.onStart()
+    }
+
+    override fun onResume() {
+        faqTextView.text = HtmlCompat.fromHtml(faqDisplay, 0)
+        super.onResume()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/HomeFragment.kt b/app/src/main/java/com/spartahack/spartahack_android/HomeFragment.kt
new file mode 100644
index 0000000..3022a4f
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/HomeFragment.kt
@@ -0,0 +1,53 @@
+package com.spartahack.spartahack_android
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.spartahack.spartahack_android.tools.Timer
+import kotlinx.android.synthetic.main.home_view.*
+import java.lang.System.currentTimeMillis
+
+/**
+ * The home fragment is the default page for the app. It displays a timer which counts down to the
+ * start of the event, and displays the schedule beneath it.
+ *
+ * fragment_id: [Int] must be the LAYOUT id (R.layout.home_view) for the XML file which contains the
+ * layout for the home fragment.
+ */
+class HomeFragment(private val fragment_id:Int) : Fragment(fragment_id) {
+
+    private lateinit var timer: Timer
+    // 3/27/20 @ 6:00 PM, the start of the event.
+    private val END_DATE_MILLS = 1585346400000
+
+    // Inflates the view for the fragment.
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?): View? {
+        return inflater.inflate(fragment_id, container, false)
+    }
+
+    override fun onStart() {
+        // Initialize the timer.
+        val currentDate = currentTimeMillis()
+        val endTimeMills = END_DATE_MILLS - currentDate
+        val timer = Timer(endTimeMills, 1000, timer_text)
+        timer.start()
+
+        super.onStart()
+    }
+
+    override fun onResume() {
+        // Initialize the timer.
+        val currentDate = currentTimeMillis()
+        val endTimeMills = END_DATE_MILLS - currentDate
+        val timer = Timer(endTimeMills, 1000, timer_text)
+        timer.start()
+
+        super.onResume()
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/MainActivity.kt b/app/src/main/java/com/spartahack/spartahack_android/MainActivity.kt
index 9c08259..54b1be4 100644
--- a/app/src/main/java/com/spartahack/spartahack_android/MainActivity.kt
+++ b/app/src/main/java/com/spartahack/spartahack_android/MainActivity.kt
@@ -1,97 +1,113 @@
 package com.spartahack.spartahack_android
 
-import android.content.Intent
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.os.Build
 import android.os.Bundle
-import androidx.core.view.GravityCompat
-import androidx.appcompat.app.ActionBarDrawerToggle
 import android.view.MenuItem
-import androidx.drawerlayout.widget.DrawerLayout
-import com.google.android.material.navigation.NavigationView
+import androidx.annotation.IdRes
 import androidx.appcompat.app.AppCompatActivity
-import android.view.Menu
-import androidx.appcompat.widget.Toolbar
-import com.spartahack.spartahack_android.tools.Timer
-import kotlinx.android.synthetic.main.app_bar_main.*
-import java.lang.System.currentTimeMillis
+import androidx.fragment.app.Fragment
+import androidx.viewpager.widget.ViewPager
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import kotlinx.android.synthetic.main.main_view.*
 
-class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
+/*
+ * Just about all of this code is copied from the link below. It handles the fragments and the view
+ * pager.
+ * https://pspdfkit.com/blog/2019/using-the-bottom-navigation-view-in-android/
+ */
 
+class MainActivity : AppCompatActivity(), BottomNavigationView.OnNavigationItemSelectedListener {
+    private lateinit var viewPager: ViewPager
+    private lateinit var bottomNav: BottomNavigationView
+    private lateinit var mainPagerAdapter: MainPagerAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        val toolbar: Toolbar = findViewById(R.id.toolbar)
-        setSupportActionBar(toolbar)
+        setContentView(R.layout.main_view)
 
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        val navView: NavigationView = findViewById(R.id.nav_view)
-        val toggle = ActionBarDrawerToggle(
-                this, drawerLayout, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
-        drawerLayout.addDrawerListener(toggle)
-        toggle.syncState()
+        // Create the events notification channel.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val CHANNEL_ID = getString(R.string.events_id)
+            val name = getString(R.string.events_name)
+            val descriptionText = getString(R.string.events_description)
+            val importance = NotificationManager.IMPORTANCE_DEFAULT
+            val eventsChannel = NotificationChannel(CHANNEL_ID, name, importance)
+            eventsChannel.description = descriptionText
+            // Register the channel with the system.
+            val notificationManager = getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+            notificationManager.createNotificationChannel(eventsChannel)
+        }
 
-        navView.setNavigationItemSelectedListener(this)
+        // Initialize toolbar
+        setSupportActionBar(findViewById(R.id.toolbar))
 
-        val END_DATE = 1580468400000 // Should be the date of the event
-        val currentDate = currentTimeMillis()
-        val endTimeMills = END_DATE - currentDate
-        val timer = Timer(endTimeMills, 1000, countdownTimer)
+        // Initialize fragment container, bottom navigation menu, and the pager.
+        viewPager = fragment_container
+        bottomNav = bottom_nav
+        mainPagerAdapter = MainPagerAdapter(supportFragmentManager)
 
-        timer.start()
-    }
+        // Set items to be displayed.
+        mainPagerAdapter.setItems(
+            arrayListOf(
+                MainScreen.HOME,
+                MainScreen.MAPS,
+                MainScreen.FAQ,
+                MainScreen.QR,
+                MainScreen.PROFILE
+            )
+        )
 
-    override fun onBackPressed() {
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
-            drawerLayout.closeDrawer(GravityCompat.START)
-        } else {
-            super.onBackPressed()
+        // Show the default screen.
+        val defaultScreen = MainScreen.HOME
+        scrollToScreen(defaultScreen)
+        selectBottomNavigationViewMenuItem(defaultScreen.menuItemId)
+        supportActionBar?.setTitle(defaultScreen.titleStringId)
 
-        }
-    }
+        // Set the listener for item selection in the bottom navigation view.
+        bottomNav.setOnNavigationItemSelectedListener(this)
 
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        menuInflater.inflate(R.menu.main, menu)
-        return true
+        // Attach an adapter to the view pager and make it select the bottom navigation
+        // menu item and change the title to proper values when selected.
+        viewPager.adapter = mainPagerAdapter
+        viewPager.addOnPageChangeListener(object : ViewPager.SimpleOnPageChangeListener() {
+            override fun onPageSelected(position: Int) {
+                val selectedScreen = mainPagerAdapter.getItems()[position]
+                selectBottomNavigationViewMenuItem(selectedScreen.menuItemId)
+                supportActionBar?.setTitle(selectedScreen.titleStringId)
+            }
+        })
     }
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        return when (item.itemId) {
-            R.id.action_settings -> true
-            else -> super.onOptionsItemSelected(item)
+
+    /**
+     * Scrolls `ViewPager` to show the provided screen.
+     */
+    private fun scrollToScreen(mainScreen: MainScreen) {
+        val screenPosition = mainPagerAdapter.getItems().indexOf(mainScreen)
+        if (screenPosition != viewPager.currentItem) {
+            viewPager.currentItem = screenPosition
         }
     }
 
-    override fun onNavigationItemSelected(item: MenuItem): Boolean {
-        // Handle navigation view item clicks here.
-        when (item.itemId) {
-            R.id.nav_home -> {
-                // do nothing. already here
-
-            }
-            R.id.nav_maps -> {
-                // set activity to maps
-
-                var intent = Intent(this, MapsActivity::class.java)
-                startActivity(intent)
-            }
-            R.id.nav_faq -> {
-                // set activity to faq
-                var intent = Intent(this, FAQActivity::class.java)
-                startActivity(intent)
-            }
-            R.id.nav_schedule -> {
-                // set activity to schedule
-                var intent = Intent(this, ScheduleActivity::class.java)
-                startActivity(intent)
-            }
+    /**
+     * Selects the specified item in the bottom navigation view.
+     */
+    private fun selectBottomNavigationViewMenuItem(@IdRes menuItemId: Int) {
+        bottomNav.setOnNavigationItemSelectedListener(null)
+        bottomNav.selectedItemId = menuItemId
+        bottomNav.setOnNavigationItemSelectedListener(this)
+    }
 
+    /**
+     * Listener implementation for registering bottom navigation clicks.
+     */
+    override fun onNavigationItemSelected(menuItem: MenuItem): Boolean {
+        getMainScreenForMenuItem(menuItem.itemId)?.let {
+            scrollToScreen(it)
+            supportActionBar?.setTitle(it.titleStringId)
+            return true
         }
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        drawerLayout.closeDrawer(GravityCompat.START)
-        return true
+        return false
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/MainPagerAdapter.kt b/app/src/main/java/com/spartahack/spartahack_android/MainPagerAdapter.kt
new file mode 100644
index 0000000..f96955d
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/MainPagerAdapter.kt
@@ -0,0 +1,37 @@
+package com.spartahack.spartahack_android
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+
+/*
+ * All of this code is copied from the link below. It handles the fragments and the view
+ * pager.
+ * https://pspdfkit.com/blog/2019/using-the-bottom-navigation-view-in-android/
+ */
+
+class MainPagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(fm) {
+
+    private val screens = arrayListOf<MainScreen>()
+
+    fun setItems(screens: List<MainScreen>) {
+        this.screens.apply {
+            clear()
+            addAll(screens)
+            notifyDataSetChanged()
+        }
+    }
+
+    fun getItems(): List<MainScreen> {
+        return screens
+    }
+
+    override fun getItem(position: Int): Fragment {
+        return screens[position].fragment
+    }
+
+    override fun getCount(): Int {
+        return screens.size
+    }
+}
+
diff --git a/app/src/main/java/com/spartahack/spartahack_android/MainScreen.kt b/app/src/main/java/com/spartahack/spartahack_android/MainScreen.kt
new file mode 100644
index 0000000..57a455a
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/MainScreen.kt
@@ -0,0 +1,37 @@
+package com.spartahack.spartahack_android
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.IdRes
+import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
+
+/*
+ * All of this code is copied from the link below. It handles the fragments and the view
+ * pager.
+ * https://pspdfkit.com/blog/2019/using-the-bottom-navigation-view-in-android/
+ */
+
+/**
+ * Screens available for display in the main screen, with their respective titles,
+ * icons, and menu item IDs and fragments.
+ */
+enum class MainScreen(@IdRes val menuItemId: Int,
+                      @DrawableRes val menuItemIconId: Int,
+                      @StringRes val titleStringId: Int,
+                      val fragment: Fragment
+) {
+    HOME(R.id.nav_home, R.drawable.ic_home_black_24dp, R.string.home_icon_title, HomeFragment(R.layout.home_view)),
+    MAPS(R.id.nav_maps, R.drawable.ic_map_black_24dp, R.string.map_icon_title, MapsFragment(R.layout.maps_view)),
+    FAQ(R.id.nav_faq, R.drawable.ic_forum_black_24dp, R.string.faq_icon_title, FAQFragment(R.layout.faq_view)),
+    QR(R.id.nav_qr, R.drawable.ic_camera_alt_black_24dp, R.string.qr_icon_title, QRFragment(R.layout.qr_view)),
+    PROFILE(R.id.nav_profile, R.drawable.ic_person_black_24dp, R.string.profile_icon_title, ProfileFragment(R.layout.profile_view))
+}
+
+fun getMainScreenForMenuItem(menuItemId: Int): MainScreen? {
+    for (mainScreen in MainScreen.values()) {
+        if (mainScreen.menuItemId == menuItemId) {
+            return mainScreen
+        }
+    }
+    return null
+}
diff --git a/app/src/main/java/com/spartahack/spartahack_android/MapsActivity.kt b/app/src/main/java/com/spartahack/spartahack_android/MapsActivity.kt
deleted file mode 100644
index 4243a60..0000000
--- a/app/src/main/java/com/spartahack/spartahack_android/MapsActivity.kt
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.spartahack.spartahack_android
-
-import android.content.Intent
-import android.os.Bundle
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.google.android.material.snackbar.Snackbar
-import androidx.core.view.GravityCompat
-import androidx.appcompat.app.ActionBarDrawerToggle
-import android.view.MenuItem
-import androidx.drawerlayout.widget.DrawerLayout
-import com.google.android.material.navigation.NavigationView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
-import android.view.Menu
-
-class MapsActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
-
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_maps)
-        val toolbar: Toolbar = findViewById(R.id.toolbar)
-        setSupportActionBar(toolbar)
-
-        val fab: FloatingActionButton = findViewById(R.id.fab)
-        fab.setOnClickListener { view ->
-            Snackbar.make(view, "This will be the profile view", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
-        }
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        val navView: NavigationView = findViewById(R.id.nav_view)
-        val toggle = ActionBarDrawerToggle(
-                this, drawerLayout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
-        drawerLayout.addDrawerListener(toggle)
-        toggle.syncState()
-
-        navView.setNavigationItemSelectedListener(this)
-    }
-
-    override fun onBackPressed() {
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
-            drawerLayout.closeDrawer(GravityCompat.START)
-        } else {
-            super.onBackPressed()
-
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        menuInflater.inflate(R.menu.main, menu)
-        return true
-    }
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        return when (item.itemId) {
-            R.id.action_settings -> true
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    override fun onNavigationItemSelected(item: MenuItem): Boolean {
-        // Handle navigation view item clicks here.
-        when (item.itemId) {
-            R.id.nav_home -> {
-                // change to home activity
-                var intent = Intent(this, MainActivity::class.java)
-                startActivity(intent)
-            }
-            R.id.nav_maps -> {
-                // do nothing. already here
-            }
-            R.id.nav_faq -> {
-// set activity to FAQ
-                var intent = Intent(this, FAQActivity::class.java)
-                startActivity(intent)
-            }
-            R.id.nav_schedule -> {
-                // change to schedule activity
-                var intent = Intent(this, ScheduleActivity::class.java)
-                startActivity(intent)
-            }
-
-
-        }
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        drawerLayout.closeDrawer(GravityCompat.START)
-        return true
-    }
-}
diff --git a/app/src/main/java/com/spartahack/spartahack_android/MapsFragment.kt b/app/src/main/java/com/spartahack/spartahack_android/MapsFragment.kt
new file mode 100644
index 0000000..a031a51
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/MapsFragment.kt
@@ -0,0 +1,17 @@
+package com.spartahack.spartahack_android
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+class MapsFragment(private val fragment_id:Int) : Fragment(fragment_id) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?): View? {
+        return inflater.inflate(fragment_id, container, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/ProfileActivity.kt b/app/src/main/java/com/spartahack/spartahack_android/ProfileActivity.kt
deleted file mode 100644
index ec2aac0..0000000
--- a/app/src/main/java/com/spartahack/spartahack_android/ProfileActivity.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-package com.spartahack.spartahack_android
-
-import android.content.Intent
-import android.os.Bundle
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.google.android.material.snackbar.Snackbar
-import androidx.core.view.GravityCompat
-import androidx.appcompat.app.ActionBarDrawerToggle
-import android.view.MenuItem
-import androidx.drawerlayout.widget.DrawerLayout
-import com.google.android.material.navigation.NavigationView
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
-import android.view.Menu
-
-class ProfileActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
-
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        val toolbar: Toolbar = findViewById(R.id.toolbar)
-        setSupportActionBar(toolbar)
-
-        val fab: FloatingActionButton = findViewById(R.id.fab)
-        fab.setOnClickListener { view ->
-            Snackbar.make(view, "This will be the profile view", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
-        }
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        val navView: NavigationView = findViewById(R.id.nav_view)
-        val toggle = ActionBarDrawerToggle(
-                this, drawerLayout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
-        drawerLayout.addDrawerListener(toggle)
-        toggle.syncState()
-
-        navView.setNavigationItemSelectedListener(this)
-    }
-
-    override fun onBackPressed() {
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
-            drawerLayout.closeDrawer(GravityCompat.START)
-        } else {
-            super.onBackPressed()
-
-        }
-    }
-
-    override fun onCreateOptionsMenu(menu: Menu): Boolean {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        menuInflater.inflate(R.menu.main, menu)
-        return true
-    }
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        // Handle action bar item clicks here. The action bar will
-        // automatically handle clicks on the Home/Up button, so long
-        // as you specify a parent activity in AndroidManifest.xml.
-        return when (item.itemId) {
-            R.id.action_settings -> true
-            else -> super.onOptionsItemSelected(item)
-        }
-    }
-
-    override fun onNavigationItemSelected(item: MenuItem): Boolean {
-        // Handle navigation view item clicks here.
-        when (item.itemId) {
-            R.id.nav_home -> {
-                // do nothing. already here
-
-            }
-            R.id.nav_maps -> {
-                // set activity to maps
-
-                var intent = Intent(this, MapsActivity::class.java)
-                startActivity(intent)
-            }
-            R.id.nav_faq -> {
-                // set activity to faq
-                var intent = Intent(this, FAQActivity::class.java)
-                startActivity(intent)
-            }
-            R.id.nav_schedule -> {
-                // set activity to schedule
-                var intent = Intent(this, ScheduleActivity::class.java)
-                startActivity(intent)
-            }
-
-        }
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        drawerLayout.closeDrawer(GravityCompat.START)
-        return true
-    }
-}
diff --git a/app/src/main/java/com/spartahack/spartahack_android/ProfileFragment.kt b/app/src/main/java/com/spartahack/spartahack_android/ProfileFragment.kt
new file mode 100644
index 0000000..4d67f1e
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/ProfileFragment.kt
@@ -0,0 +1,17 @@
+package com.spartahack.spartahack_android
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+class ProfileFragment(private val fragment_id:Int) : Fragment(fragment_id) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?): View? {
+        return inflater.inflate(fragment_id, container, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/QRFragment.kt b/app/src/main/java/com/spartahack/spartahack_android/QRFragment.kt
new file mode 100644
index 0000000..ba442f6
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/QRFragment.kt
@@ -0,0 +1,17 @@
+package com.spartahack.spartahack_android
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+
+class QRFragment(private val fragment_id:Int) : Fragment(fragment_id) {
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?): View? {
+        return inflater.inflate(fragment_id, container, false)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/QRScannerActivity.kt b/app/src/main/java/com/spartahack/spartahack_android/QRScannerActivity.kt
index a3f5752..95df0d5 100644
--- a/app/src/main/java/com/spartahack/spartahack_android/QRScannerActivity.kt
+++ b/app/src/main/java/com/spartahack/spartahack_android/QRScannerActivity.kt
@@ -1,47 +1,201 @@
 package com.spartahack.spartahack_android
 
+import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
+import android.hardware.Camera
 import android.os.Bundle
-import androidx.core.view.GravityCompat
-import androidx.appcompat.app.ActionBarDrawerToggle
+import android.util.Log
+import android.view.Menu
 import android.view.MenuItem
-import androidx.drawerlayout.widget.DrawerLayout
-import com.google.android.material.navigation.NavigationView
+import android.widget.FrameLayout
+import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
-import android.view.Menu
-import androidx.appcompat.widget.Toolbar
-import com.spartahack.spartahack_android.tools.Timer
-import kotlinx.android.synthetic.main.app_bar_main.*
-import java.lang.System.currentTimeMillis
+import com.google.android.material.navigation.NavigationView
+import com.google.firebase.ml.vision.FirebaseVision
+import com.google.firebase.ml.vision.barcode.FirebaseVisionBarcode
+import com.google.firebase.ml.vision.barcode.FirebaseVisionBarcodeDetectorOptions
+import com.google.firebase.ml.vision.common.FirebaseVisionImage
+import com.google.firebase.ml.vision.common.FirebaseVisionImageMetadata
+import com.spartahack.spartahack_android.tools.CameraPreview
+import com.spartahack.spartahack_android.tools.ImageAnalyzer
+import kotlinx.android.synthetic.main.qr_view.*
 
+/* Hi. I am aware that the Camera API is deprecated. However, it is a known problem in Android that
+* it is extremely difficult to work with the camera. I have researched alternatives, but the
+* original Camera API is the most stable, and easiest to implement in an understandable manner.
+* Additionally, the ML Kit used to read the barcodes requires metadata about the camera that is not
+* provided by other libraries and APIs. In future versions of the app, this should be updated to a
+* more recent library or API. */
+
+@Suppress("DEPRECATION")
+@SuppressWarnings("deprecation")
 class QRScannerActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListener {
 
+    private val previewView = camera_preview
+    private val cameraButton = photoButton
+    private var qrString : String? = null
+    private var cameraPreview : CameraPreview? = null
+    private var camera : Camera? = null
+    private val cameraID = 0
+    private lateinit var pictureData : ByteArray
+    private val picture = Camera.PictureCallback { data, _ ->
+            pictureData = data
+            return@PictureCallback
+        }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_qr)
-        val toolbar: Toolbar = findViewById(R.id.toolbar)
-        setSupportActionBar(toolbar)
+        setContentView(R.layout.qr_view)
+
+        // Initializes the camera and preview.
+        initCamera()
+        initPreview()
 
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        val navView: NavigationView = findViewById(R.id.nav_view)
-        val toggle = ActionBarDrawerToggle(
-                this, drawerLayout, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
-        drawerLayout.addDrawerListener(toggle)
-        toggle.syncState()
+        /* When the user clicks the camera button, a picture is taken.
+        * Additionally, all of the QR processing is done as well, since it guarantees that there is
+        * picture data to work with. */
+        cameraButton.setOnClickListener {
+            // get an image from the camera
+            camera?.takePicture(null, null, picture)
+            // Stops the preview after taking a picture.
+            camera?.stopPreview()
+            // Release the camera so that it can be used by other applications.
+            camera?.release()
+
+            // Get the string represented by the QR code.
+            qrString = processImage(pictureData, this)
+        }
 
-        navView.setNavigationItemSelectedListener(this)
 
     }
 
-    override fun onBackPressed() {
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
-            drawerLayout.closeDrawer(GravityCompat.START)
-        } else {
-            super.onBackPressed()
 
+    private fun checkCameraHardware(context: Context): Boolean {
+        /* Make sure device has a camera. */
+        return context.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
+    }
+
+    private fun getCameraInstance(): Camera? {
+        /* Safely gets an instance of the Camera. */
+        return try {
+            Camera.open(cameraID) // attempt to get a Camera instance
+        } catch (e: Exception) {
+            // Camera is not available (in use or does not exist)
+            null // returns null if camera is unavailable
+        }
+    }
+
+    private fun initCamera(){
+        /* Takes care of all of the processes needed to start the camera. */
+
+        // Initializes the camera safely.
+        if(checkCameraHardware(this)){
+            camera = getCameraInstance()
+        }
+
+        // Sets the camera orientation.
+        camera?.setDisplayOrientation(90)
+    }
+
+    private fun initPreview(){
+        /* Takes care of all of the processes needed to create a preview and associate it with the
+        * camera. */
+
+        // Creates an instance of the CameraPreview class.
+        cameraPreview = camera?.let{CameraPreview(this, it)}
+
+        // Initializes the preview.
+        cameraPreview?.also {
+            val preview: FrameLayout = previewView
+            preview.addView(it)
+        }
+
+        // Checks if the preview was able to be initialized. If not, a Toast is created to tell
+        // the user to exit the application and retry.
+        if(cameraPreview == null){
+            val message = "Camera preview was unable to be initialized. Please close the application" +
+                    " and try again."
+            Toast.makeText(this,message,Toast.LENGTH_SHORT).show()
         }
+
+        // Starts the preview for the camera.
+        camera?.startPreview()
+    }
+
+
+    private fun processImage(imgData:ByteArray, context: Context) : String?{
+
+        // Set options for the detector.
+        val options = FirebaseVisionBarcodeDetectorOptions.Builder()
+            .setBarcodeFormats(FirebaseVisionBarcode.FORMAT_QR_CODE)
+            .build()
+
+        // Create an ImageAnalyzer and use it to get the rotation of the camera.
+        val imageAnalyzer = ImageAnalyzer()
+        val rotation = imageAnalyzer.getRotation(cameraID.toString(), QRScannerActivity(), context)
+
+        // Set metadata for the detector.
+        val metadata = FirebaseVisionImageMetadata.Builder()
+            .setWidth(480) // 480x360 is typically sufficient for
+            .setHeight(360) // image recognition
+            .setFormat(FirebaseVisionImageMetadata.IMAGE_FORMAT_NV21)
+            .setRotation(rotation)
+            .build()
+
+        // Create an image compatible with Firebase's Barcode Detector.
+        val image = FirebaseVisionImage.fromByteArray(imgData, metadata)
+
+        // Create the detector.
+        val detector = FirebaseVision.getInstance().getVisionBarcodeDetector(options)
+
+        var returnValue : String? = null
+
+        val result = detector.detectInImage(image)
+            .addOnSuccessListener { barcodes ->
+                // Task completed successfully
+                val barcode = barcodes[0]
+
+                // QR code should only ever be a TYPE_TEXT.
+                if (barcode.valueType == FirebaseVisionBarcode.TYPE_TEXT){
+                    returnValue = barcode.rawValue
+                    Toast.makeText(context, "QR Value: " + returnValue, Toast.LENGTH_SHORT).show()
+
+                }else{
+                    Log.d("FirebaseVision", "Barcode returned non-text type.")
+                    val message = "QR code read incorrectly. Please close and try again."
+                    Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+                }
+
+            }
+            .addOnFailureListener {
+                // Task failed with an exception
+                Log.d("FirebaseVision", it.toString())
+                val message = "QR code read incorrectly. Please close and try again."
+                Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
+            }
+
+        return returnValue
+    }
+
+    override fun onResume() {
+        // Initializes the camera and preview.
+        initCamera()
+        initPreview()
+        super.onResume()
+    }
+
+    override fun onPause() {
+        // Stop the camera preview.
+        camera?.stopPreview()
+        // Release the camera so that it can be used by other applications.
+        camera?.release()
+        super.onPause()
+    }
+
+
+    override fun onBackPressed() {
+        super.onBackPressed()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -66,26 +220,12 @@ class QRScannerActivity : AppCompatActivity(), NavigationView.OnNavigationItemSe
                 // do nothing. already here
 
             }
-            R.id.nav_maps -> {
-                // set activity to maps
-
-                var intent = Intent(this, MapsActivity::class.java)
-                startActivity(intent)
-            }
             R.id.nav_faq -> {
                 // set activity to faq
                 var intent = Intent(this, FAQActivity::class.java)
                 startActivity(intent)
             }
-            R.id.nav_schedule -> {
-                // set activity to schedule
-                var intent = Intent(this, ScheduleActivity::class.java)
-                startActivity(intent)
-            }
-
         }
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        drawerLayout.closeDrawer(GravityCompat.START)
         return true
     }
 }
diff --git a/app/src/main/java/com/spartahack/spartahack_android/ScheduleActivity.kt b/app/src/main/java/com/spartahack/spartahack_android/ScheduleActivity.kt
index de5b13a..20e7371 100644
--- a/app/src/main/java/com/spartahack/spartahack_android/ScheduleActivity.kt
+++ b/app/src/main/java/com/spartahack/spartahack_android/ScheduleActivity.kt
@@ -18,32 +18,11 @@ class ScheduleActivity : AppCompatActivity(), NavigationView.OnNavigationItemSel
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_schedule)
-        val toolbar: Toolbar = findViewById(R.id.toolbar)
-        setSupportActionBar(toolbar)
-
-        val fab: FloatingActionButton = findViewById(R.id.fab)
-        fab.setOnClickListener { view ->
-            Snackbar.make(view, "This will be the profile view", Snackbar.LENGTH_LONG)
-                    .setAction("Action", null).show()
-        }
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        val navView: NavigationView = findViewById(R.id.nav_view)
-        val toggle = ActionBarDrawerToggle(
-                this, drawerLayout, toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close)
-        drawerLayout.addDrawerListener(toggle)
-        toggle.syncState()
-
-        navView.setNavigationItemSelectedListener(this)
+        setContentView(R.layout.schedule_view)
     }
 
     override fun onBackPressed() {
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        if (drawerLayout.isDrawerOpen(GravityCompat.START)) {
-            drawerLayout.closeDrawer(GravityCompat.START)
-        } else {
-            super.onBackPressed()
-        }
+        super.onBackPressed()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
@@ -69,24 +48,13 @@ class ScheduleActivity : AppCompatActivity(), NavigationView.OnNavigationItemSel
                 var intent = Intent(this, MainActivity::class.java)
                 startActivity(intent)
             }
-            R.id.nav_maps -> {
-                // change activity to maps
-                var intent = Intent(this, MapsActivity::class.java)
-                startActivity(intent)
-            }
             R.id.nav_faq -> {
-            // set activity to FAQ
+                // set activity to FAQ
                 var intent = Intent(this, FAQActivity::class.java)
                 startActivity(intent)
             }
-            R.id.nav_schedule -> {
-                // do nothing. already here
-            }
-
-
         }
-        val drawerLayout: DrawerLayout = findViewById(R.id.drawer_layout)
-        drawerLayout.closeDrawer(GravityCompat.START)
+
         return true
     }
 }
diff --git a/app/src/main/java/com/spartahack/spartahack_android/Secrets.java b/app/src/main/java/com/spartahack/spartahack_android/Secrets.java
new file mode 100644
index 0000000..d6a4b6e
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/Secrets.java
@@ -0,0 +1,21 @@
+package com.spartahack.spartahack_android;
+
+/**
+ * Class which stores all the "Secrets" of this program
+ *
+ * Stores API keys, paths, secrets for apis, tokens, etc. all in one centralized location
+ *
+ * WARNING: Make sure this file is never pushed to the github repo. This is a localized file
+ */
+
+public class Secrets {
+
+    // TODO: Change URL for production
+    final static private String SPARTAHACK_API_URL = "http://api.elephant.spartahack.com/";
+
+
+    public static String getSPARTAHACK_API_URL()
+    {
+        return SPARTAHACK_API_URL;
+    }
+}
diff --git a/app/src/main/java/com/spartahack/spartahack_android/scripts/FAQAsyncTask.kt b/app/src/main/java/com/spartahack/spartahack_android/scripts/FAQAsyncTask.kt
index 15180e9..7fb3729 100644
--- a/app/src/main/java/com/spartahack/spartahack_android/scripts/FAQAsyncTask.kt
+++ b/app/src/main/java/com/spartahack/spartahack_android/scripts/FAQAsyncTask.kt
@@ -3,19 +3,20 @@ package com.spartahack.spartahack_android.scripts
 import android.os.AsyncTask
 import android.util.Log
 import android.widget.TextView
+import androidx.core.text.HtmlCompat
 
 class FAQAsyncTask(val textView: TextView) : AsyncTask<Void, String, String>(){
 
     override fun doInBackground(vararg p0: Void?): String {
         Log.i("FAQAsync", "doInBackground")
-        val dispText = ""//faqMain()
+        val dispText = faqMain()
         publishProgress(dispText)
         return ""
     }
 
-    override fun onProgressUpdate(vararg values: String?) {
+    override fun onProgressUpdate(vararg values: String) {
         Log.i("FAQAsync", "onProgressUpdate")
-        textView.text = values[0]
+        textView.text = HtmlCompat.fromHtml(values[0], 0)
         super.onProgressUpdate(*values)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/scripts/faq_activity.kt b/app/src/main/java/com/spartahack/spartahack_android/scripts/faq_activity.kt
index 0cfc9f1..1356daa 100644
--- a/app/src/main/java/com/spartahack/spartahack_android/scripts/faq_activity.kt
+++ b/app/src/main/java/com/spartahack/spartahack_android/scripts/faq_activity.kt
@@ -44,7 +44,7 @@ fun getAnswer(str: String): String {
 } // getAnswer.
 
 
-suspend fun faqMain(): String = withContext(Dispatchers.Default){
+suspend fun faqMainSuspend(): String = withContext(Dispatchers.Default){
     /** The main structure of the script. Uses getQuestion and getAnswer. */
 
     // Makes a call to the api to get the FAQ information as a raw string and splits the raw FAQ
@@ -69,4 +69,30 @@ suspend fun faqMain(): String = withContext(Dispatchers.Default){
 
     return@withContext displayStr
 
-} // faqMain.
\ No newline at end of file
+} // faqMainSuspend.
+
+fun faqMain(): String{
+    /** The main structure of the script. Uses getQuestion and getAnswer. */
+
+    // Makes a call to the api to get the FAQ information as a raw string and splits the raw FAQ
+    // string into a list.
+    var faqRawStr = APICall("faqs").sendGet()
+    faqRawStr = faqRawStr.removeRange(0, 1)
+    val faqList = faqRawStr.split("},")
+
+    var displayStr = ""
+
+    // Takes every entry in the FAQ list, then formats it in such a way that it is easy to display.
+    for (i in faqList) {
+        val question = getQuestion(i)
+        val answer = getAnswer(i)
+
+        // Does not make an addition to the display string if the current answer is
+        // "What are exfdsact nufgddmbers?"
+        if (answer != "skip"){
+            displayStr += ("<h2>" + question + "</h2>\n" + "<p>" + answer + "</p>\n")
+        }
+    }
+
+    return displayStr
+} // faqMain
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/tools/CameraPreview.kt b/app/src/main/java/com/spartahack/spartahack_android/tools/CameraPreview.kt
new file mode 100644
index 0000000..6236494
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/tools/CameraPreview.kt
@@ -0,0 +1,44 @@
+package com.spartahack.spartahack_android.tools
+
+import android.content.Context
+import android.hardware.Camera
+import android.util.Log
+import android.view.SurfaceHolder
+import android.view.SurfaceView
+import java.io.IOException
+
+@Suppress("DEPRECATION")
+class CameraPreview(context: Context, private val mCamera: Camera) : SurfaceView(context), SurfaceHolder.Callback {
+
+    private val previewHolder: SurfaceHolder = holder.apply {
+        // Install a SurfaceHolder.Callback so we get notified when the
+        // underlying surface is created and destroyed.
+        addCallback(this@CameraPreview)
+        // deprecated setting, but required on Android versions prior to 3.0
+        setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS)
+    }
+
+    init{
+        surfaceCreated(previewHolder)
+    }
+
+    override fun surfaceCreated(holder: SurfaceHolder) {
+        // The Surface has been created, now tell the camera where to draw the preview.
+        mCamera.apply {
+            try {
+                setPreviewDisplay(holder)
+                startPreview()
+            } catch (e: IOException) {
+                Log.d("Camera Preview", "Error setting camera preview: ${e.message}")
+            }
+        }
+    }
+
+    override fun surfaceDestroyed(holder: SurfaceHolder) {
+        // Releasing the camera preview is done in the main activity.
+    }
+
+    override fun surfaceChanged(p0: SurfaceHolder?, p1: Int, p2: Int, p3: Int) {
+        // Leave empty. I'll add stuff to this if things break.
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/tools/EasyCamera.kt b/app/src/main/java/com/spartahack/spartahack_android/tools/EasyCamera.kt
new file mode 100644
index 0000000..6310fbe
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/tools/EasyCamera.kt
@@ -0,0 +1,45 @@
+package com.spartahack.spartahack_android.tools
+
+import android.content.Context
+import android.content.pm.PackageManager
+import android.hardware.Camera
+import android.view.SurfaceHolder
+import com.spartahack.spartahack_android.QRScannerActivity
+
+/* Hi. I am aware that the Camera API is deprecated. However, it is a known problem in Android that
+* it is extremely difficult to work with the camera. I have researched alternatives, but the
+* original Camera API is the most stable, and easiest to implement in an understandable manner.
+* Additionally, the ML Kit used to read the barcodes requires metadata about the camera that is not
+* provided by other libraries and APIs. In future versions of the app, this should be updated to a
+* more recent library or API. */
+
+
+@Suppress("DEPRECATION")
+@SuppressWarnings("deprecation")
+class EasyCamera(holder:SurfaceHolder) {
+
+    private val context = QRScannerActivity()
+    var camera : Camera? = null
+    val id = 0
+
+    init{
+        if(checkCameraHardware(context)){
+            camera = getCameraInstance()
+        }
+    }
+
+
+    private fun checkCameraHardware(context: Context): Boolean {
+        /* Make sure device has a camera. */
+        return context.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA)
+    }
+
+    private fun getCameraInstance(): Camera? {
+        return try {
+            Camera.open(id) // attempt to get a Camera instance
+        } catch (e: Exception) {
+            // Camera is not available (in use or does not exist)
+            null // returns null if camera is unavailable
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/tools/FirebaseNotification.kt b/app/src/main/java/com/spartahack/spartahack_android/tools/FirebaseNotification.kt
index c91227f..779a3e4 100644
--- a/app/src/main/java/com/spartahack/spartahack_android/tools/FirebaseNotification.kt
+++ b/app/src/main/java/com/spartahack/spartahack_android/tools/FirebaseNotification.kt
@@ -1,26 +1,46 @@
 package com.spartahack.spartahack_android.tools
 
-//import android.app.Notification
-//import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Intent
+import androidx.core.app.NotificationCompat
+import androidx.core.app.NotificationManagerCompat
 import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
+import com.spartahack.spartahack_android.R
+import com.spartahack.spartahack_android.ScheduleActivity
 
 class FirebaseNotification : FirebaseMessagingService() {
     /* This class extends FirebaseMessagingService to allow the app to receive notifications from
     * our Firebase server. This class is only necessary because it would probably be a good idea to
     * display notifications to our users even when they are in the app, so that they don't miss
     * special activity notifications. This class is unnecessary if it is decided that foreground
-    * notifications are not needed.*/
+    * notifications are not needed. */
+
+    private val CHANNEL_ID = getString(R.string.events_id)
+    private val intent = Intent(this, ScheduleActivity::class.java).apply {
+        flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
+    }
+    private val pendingIntent: PendingIntent = PendingIntent.getActivity(this, 0, intent, 0)
 
     override fun onMessageReceived(message: RemoteMessage) {
-        /* Retrieves the message from Firebase and creates a notification using the built-in
-           Notification.Builder.*/
-        /*val notificationBuilder = Notification.Builder()
+         // Retrieves the message from Firebase and creates a notification using the built-in
+         // Notification Builder.
+        val notificationBuilder = NotificationCompat.Builder(applicationContext, CHANNEL_ID)
             // ?. is Kotlin's way of checking for NULL (message.notification can return NULL)
             .setContentTitle(message.notification?.title)
             .setContentText(message.notification?.body)
-            .build()*/
+            .setContentIntent(pendingIntent)
+            .setAutoCancel(true)
 
+        val notificationId = 1  // I have no idea what this is supposed to be.
+
+        with(NotificationManagerCompat.from(this)) {
+            // notificationId is a unique int for each notification that you must define
+            notify(notificationId, notificationBuilder.build())
+        }
+    }
 
+    override fun onDeletedMessages() {
+        super.onDeletedMessages()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/tools/ImageAnalyzer.kt b/app/src/main/java/com/spartahack/spartahack_android/tools/ImageAnalyzer.kt
new file mode 100644
index 0000000..2f9b1d3
--- /dev/null
+++ b/app/src/main/java/com/spartahack/spartahack_android/tools/ImageAnalyzer.kt
@@ -0,0 +1,64 @@
+package com.spartahack.spartahack_android.tools
+
+import android.app.Activity
+import android.content.ContentValues.TAG
+import android.content.Context
+import android.content.Context.CAMERA_SERVICE
+import android.hardware.camera2.CameraAccessException
+import android.hardware.camera2.CameraCharacteristics
+import android.hardware.camera2.CameraManager
+import android.os.Build
+import android.util.Log
+import android.util.SparseIntArray
+import android.view.Surface
+import androidx.annotation.RequiresApi
+import com.google.firebase.ml.vision.common.FirebaseVisionImageMetadata
+
+class ImageAnalyzer {
+
+    private val ORIENTATIONS = SparseIntArray()
+
+    init {
+        ORIENTATIONS.append(Surface.ROTATION_0, 90)
+        ORIENTATIONS.append(Surface.ROTATION_90, 0)
+        ORIENTATIONS.append(Surface.ROTATION_180, 270)
+        ORIENTATIONS.append(Surface.ROTATION_270, 180)
+    }
+    /**
+     * Get the angle by which an image must be rotated given the device's current
+     * orientation.
+     */
+    @RequiresApi(api = Build.VERSION_CODES.LOLLIPOP)
+    @Throws(CameraAccessException::class)
+    fun getRotation(cameraId: String, activity: Activity, context: Context): Int {
+        // Get the device's current rotation relative to its "native" orientation.
+        // Then, from the ORIENTATIONS table, look up the angle the image must be
+        // rotated to compensate for the device's rotation.
+        val deviceRotation = activity.windowManager.defaultDisplay.rotation
+        var rotationCompensation = ORIENTATIONS.get(deviceRotation)
+
+        // On most devices, the sensor orientation is 90 degrees, but for some
+        // devices it is 270 degrees. For devices with a sensor orientation of
+        // 270, rotate the image an additional 180 ((270 + 270) % 360) degrees.
+        val cameraManager = context.getSystemService(CAMERA_SERVICE) as CameraManager
+        val sensorOrientation = cameraManager
+            .getCameraCharacteristics(cameraId)
+            .get(CameraCharacteristics.SENSOR_ORIENTATION)!!
+        rotationCompensation = (rotationCompensation + sensorOrientation + 270) % 360
+
+        // Return the corresponding FirebaseVisionImageMetadata rotation value.
+        val result: Int
+        when (rotationCompensation) {
+            0 -> result = FirebaseVisionImageMetadata.ROTATION_0
+            90 -> result = FirebaseVisionImageMetadata.ROTATION_90
+            180 -> result = FirebaseVisionImageMetadata.ROTATION_180
+            270 -> result = FirebaseVisionImageMetadata.ROTATION_270
+            else -> {
+                result = FirebaseVisionImageMetadata.ROTATION_0
+                Log.e(TAG, "Bad rotation value: $rotationCompensation")
+            }
+        }
+        return result
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/spartahack/spartahack_android/tools/Timer.kt b/app/src/main/java/com/spartahack/spartahack_android/tools/Timer.kt
index 3217284..fdcf33b 100644
--- a/app/src/main/java/com/spartahack/spartahack_android/tools/Timer.kt
+++ b/app/src/main/java/com/spartahack/spartahack_android/tools/Timer.kt
@@ -1,19 +1,27 @@
 package com.spartahack.spartahack_android.tools
 
 import android.os.CountDownTimer
+import android.provider.Settings.Global.getString
 import android.widget.TextView
+import com.spartahack.spartahack_android.R
 
-class Timer(endTimeMills:Long, interval:Long, val timerView:TextView):CountDownTimer(endTimeMills, interval) {
+/**
+ * The Timer class converts a date in milliseconds to a string representation of the time until a
+ * certain event.
+ *
+ * endTimeMills: [Long] the date (in milliseconds) at which the timer is to display 0.
+ * interval: [Long] the time (in milliseconds) between clock ticks.
+ * timerView: [TextView] the view in which to display the timer.
+ */
+class Timer(endTimeMills:Long, interval:Long, private val timerView:TextView):CountDownTimer(endTimeMills, interval) {
     override fun onTick(millsUntilFinished: Long) {
-        var months = (millsUntilFinished / 2628000000).toString()
         var days = (millsUntilFinished % 2628000000 / 86400000).toString()
         var hours = (millsUntilFinished % 2628000000 % 86400000 / 3600000).toString()
         var minutes = (millsUntilFinished % 2628000000 % 86400000 % 3600000 / 60000).toString()
         var seconds = (millsUntilFinished % 2628000000 % 86400000 % 3600000 % 60000 / 1000).toString()
 
-        if(months.length != 2){
-            months = "0" + months
-        }
+        // This block of if statements takes care of single-digit numbers by placing a 0 in front of
+        // them. This ensures that the display is uniform.
         if(days.length != 2){
             days = "0" + days
         }
@@ -27,10 +35,12 @@ class Timer(endTimeMills:Long, interval:Long, val timerView:TextView):CountDownT
             seconds = "0" + seconds
         }
 
-        timerView.text = months + ":" + days + ":" + hours + ":" + minutes + ":" + seconds
+        // Set the display to the correct time.
+        timerView.text = days + ":" + hours + ":" + minutes + ":" + seconds
     }
 
     override fun onFinish(){
+        // Set the display to the empty string when time is up.
         timerView.text = ""
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml b/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml
new file mode 100644
index 0000000..c872f16
--- /dev/null
+++ b/app/src/main/res/drawable/ic_camera_alt_black_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_forum_black_24dp.xml b/app/src/main/res/drawable/ic_forum_black_24dp.xml
new file mode 100644
index 0000000..26eda09
--- /dev/null
+++ b/app/src/main/res/drawable/ic_forum_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M21,6h-2v9L6,15v2c0,0.55 0.45,1 1,1h11l4,4L22,7c0,-0.55 -0.45,-1 -1,-1zM17,12L17,3c0,-0.55 -0.45,-1 -1,-1L3,2c-0.55,0 -1,0.45 -1,1v14l4,-4h10c0.55,0 1,-0.45 1,-1z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml
new file mode 100644
index 0000000..70fb291
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_map_black_24dp.xml b/app/src/main/res/drawable/ic_map_black_24dp.xml
new file mode 100644
index 0000000..b9bacc8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_map_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_black_24dp.xml
new file mode 100644
index 0000000..b2cb337
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_faq.xml b/app/src/main/res/layout/activity_faq.xml
deleted file mode 100644
index 3db4944..0000000
--- a/app/src/main/res/layout/activity_faq.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-    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:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <include
-        layout="@layout/app_bar_faq"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        app:headerLayout="@layout/nav_header_main"
-        app:menu="@menu/activity_main_drawer" />
-
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index b0a74ec..0000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-    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:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <include
-        layout="@layout/app_bar_main"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        app:headerLayout="@layout/nav_header_main"
-        app:menu="@menu/activity_main_drawer" />
-
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_maps.xml b/app/src/main/res/layout/activity_maps.xml
deleted file mode 100644
index ca3400e..0000000
--- a/app/src/main/res/layout/activity_maps.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-    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:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <include
-        layout="@layout/app_bar_maps"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        app:headerLayout="@layout/nav_header_main"
-        app:menu="@menu/activity_main_drawer" />
-
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_qr.xml b/app/src/main/res/layout/activity_qr.xml
deleted file mode 100644
index 3db4944..0000000
--- a/app/src/main/res/layout/activity_qr.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-    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:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <include
-        layout="@layout/app_bar_faq"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        app:headerLayout="@layout/nav_header_main"
-        app:menu="@menu/activity_main_drawer" />
-
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/activity_schedule.xml b/app/src/main/res/layout/activity_schedule.xml
deleted file mode 100644
index 0a25581..0000000
--- a/app/src/main/res/layout/activity_schedule.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout
-    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:id="@+id/drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:openDrawer="start">
-
-    <include
-        layout="@layout/app_bar_schedule"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:fitsSystemWindows="true"
-        app:headerLayout="@layout/nav_header_main"
-        app:menu="@menu/activity_main_drawer" />
-
-</androidx.drawerlayout.widget.DrawerLayout>
diff --git a/app/src/main/res/layout/app_bar_faq.xml b/app/src/main/res/layout/app_bar_faq.xml
deleted file mode 100644
index d965d75..0000000
--- a/app/src/main/res/layout/app_bar_faq.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".FAQActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <include layout="@layout/faq_view"/>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
deleted file mode 100644
index 562cbab..0000000
--- a/app/src/main/res/layout/app_bar_main.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:tools="http://schemas.android.com/tools"
-android:layout_width="match_parent"
-android:layout_height="match_parent"
-xmlns:app="http://schemas.android.com/apk/res-auto"
-app:layout_behavior="@string/appbar_scrolling_view_behavior"
-tools:context=".MainActivity">
-
-<com.google.android.material.appbar.AppBarLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-    <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-</com.google.android.material.appbar.AppBarLayout>
-
-<include android:id="@+id/include"
-        layout="@layout/content_main"/>
-
-<TextView
-        android:id="@+id/countdownTimer"
-        android:layout_width="310dp"
-        android:layout_height="60dp"
-        android:layout_centerHorizontal="true"
-        android:layout_centerVertical="true"
-        android:text=""
-        android:textSize="47sp"
-        android:textAlignment="center"/>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_maps.xml b/app/src/main/res/layout/app_bar_maps.xml
deleted file mode 100644
index 095fee2..0000000
--- a/app/src/main/res/layout/app_bar_maps.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MapsActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <include layout="@layout/maps_view"/>
-   
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_menu_manage" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_schedule.xml b/app/src/main/res/layout/app_bar_schedule.xml
deleted file mode 100644
index 5cad4d7..0000000
--- a/app/src/main/res/layout/app_bar_schedule.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ScheduleActivity">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <androidx.appcompat.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <include layout="@layout/schedule_view"/>
-   
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_menu_manage" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
deleted file mode 100644
index e530a6f..0000000
--- a/app/src/main/res/layout/content_main.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:context=".MainActivity"
-        tools:showIn="@layout/app_bar_main" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/faq_view.xml b/app/src/main/res/layout/faq_view.xml
index f2e3802..dcd214a 100644
--- a/app/src/main/res/layout/faq_view.xml
+++ b/app/src/main/res/layout/faq_view.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
+<RelativeLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:showIn="@layout/app_bar_faq"
-        tools:context=".FAQActivity"
-        android:id="@+id/faq_constraits">
+        android:id="@+id/faq_view">
     <ScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent">
@@ -16,9 +11,9 @@
                       android:orientation="vertical">
             <TextView
                     android:id="@+id/faqTextView"
-                    android:text="@string/faq_text_view"
+                    android:text=""
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"/>
         </LinearLayout>
     </ScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/home_view.xml b/app/src/main/res/layout/home_view.xml
new file mode 100644
index 0000000..9caa717
--- /dev/null
+++ b/app/src/main/res/layout/home_view.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/home_view">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="90dp"
+            android:text="@string/timer_display_days"
+            android:textSize="15sp"
+            android:layout_marginStart="65dp"/>
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="90dp"
+            android:text="@string/timer_display_hours"
+            android:textSize="15sp"
+            android:layout_marginStart="143dp"/>
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="90dp"
+            android:text="@string/timer_display_minutes"
+            android:textSize="15sp"
+            android:layout_marginStart="218dp"/>
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="90dp"
+            android:text="@string/timer_display_seconds"
+            android:textSize="15sp"
+            android:layout_marginStart="299dp"/>
+
+    <TextView
+            android:id="@+id/timer_text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerHorizontal="true"
+            android:text="@string/timer_default"
+            android:textSize="60sp"
+            android:layout_marginTop="100dp"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main_view.xml b/app/src/main/res/layout/main_view.xml
new file mode 100644
index 0000000..7b3dc0f
--- /dev/null
+++ b/app/src/main/res/layout/main_view.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context=".MainActivity">
+
+    <androidx.appcompat.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:elevation="4dp"
+            android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
+
+    <androidx.viewpager.widget.ViewPager
+            android:id="@+id/fragment_container"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1"/>
+
+    <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/bottom_nav"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:menu="@menu/bottom_navigation_menu"
+            android:background="@android:color/white"
+            app:elevation="16dp"/>
+</LinearLayout>
diff --git a/app/src/main/res/layout/maps_view.xml b/app/src/main/res/layout/maps_view.xml
index 81dbdc6..4d1543d 100644
--- a/app/src/main/res/layout/maps_view.xml
+++ b/app/src/main/res/layout/maps_view.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:showIn="@layout/app_bar_maps"
-    tools:context=".MapsActivity">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/maps_view"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
     <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
deleted file mode 100644
index 246001c..0000000
--- a/app/src/main/res/layout/nav_header_main.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/nav_header_height"
-    android:background="@drawable/side_nav_bar"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:theme="@style/ThemeOverlay.AppCompat.Dark"
-    android:orientation="vertical"
-    android:gravity="bottom">
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        app:srcCompat="@mipmap/ic_launcher_round"
-        android:contentDescription="@string/nav_header_desc"
-        android:id="@+id/imageView" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="@string/nav_header_title"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/nav_header_subtitle"
-        android:id="@+id/textView" />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/profile_view.xml b/app/src/main/res/layout/profile_view.xml
new file mode 100644
index 0000000..5874a67
--- /dev/null
+++ b/app/src/main/res/layout/profile_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/profile_view"
+        android:orientation="vertical">
+
+    <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Profile"
+            android:textSize="30sp"
+            android:layout_centerInParent="true"/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/qr_view.xml b/app/src/main/res/layout/qr_view.xml
index f2e3802..4be695a 100644
--- a/app/src/main/res/layout/qr_view.xml
+++ b/app/src/main/res/layout/qr_view.xml
@@ -1,24 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:showIn="@layout/app_bar_faq"
-        tools:context=".FAQActivity"
-        android:id="@+id/faq_constraits">
-    <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-        <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content"
-                      android:orientation="vertical">
-            <TextView
-                    android:id="@+id/faqTextView"
-                    android:text="@string/faq_text_view"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"/>
-        </LinearLayout>
-    </ScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+<FrameLayout
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:app="http://schemas.android.com/apk/res-auto"
+            android:orientation="vertical"
+            android:id="@+id/camera_preview"
+            android:layout_width="fill_parent"
+            android:layout_height="0dp"
+            android:layout_weight="1">
+
+        <Button
+                android:id="@+id/photoButton"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:backgroundTint="@color/colorAccent"
+                android:text="@string/capture"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                android:height="5dp"
+                android:width="5dp"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
deleted file mode 100644
index 890fdb1..0000000
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:showIn="navigation_view">
-
-    <group android:checkableBehavior="single">
-        <item
-            android:id="@+id/nav_home"
-            android:icon="@drawable/ic_menu_camera"
-            android:title="@string/menu_home" />
-        <item
-                android:id="@+id/nav_maps"
-                android:icon="@drawable/ic_menu_gallery"
-                android:title="@string/menu_maps"/>
-
-        <item
-                android:id="@+id/nav_schedule"
-                android:icon="@drawable/ic_menu_slideshow"
-                android:title="@string/menu_schedule"/>
-        <item
-                android:id="@+id/nav_faq"
-                android:icon="@drawable/ic_menu_gallery"
-                android:title="@string/menu_faq"/>
-        </group>
-
-</menu>
diff --git a/app/src/main/res/menu/bottom_navigation_menu.xml b/app/src/main/res/menu/bottom_navigation_menu.xml
new file mode 100644
index 0000000..1f78d28
--- /dev/null
+++ b/app/src/main/res/menu/bottom_navigation_menu.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+            android:id="@+id/nav_home"
+            android:enabled="true"
+            android:icon="@drawable/ic_home_black_24dp"
+            android:title="@string/home_icon_title"/>
+
+    <item
+            android:id="@+id/nav_maps"
+            android:enabled="true"
+            android:icon="@drawable/ic_map_black_24dp"
+            android:title="@string/map_icon_title"/>
+
+    <item
+            android:id="@+id/nav_faq"
+            android:enabled="true"
+            android:icon="@drawable/ic_forum_black_24dp"
+            android:title="@string/faq_icon_title"/>
+
+    <item
+            android:id="@+id/nav_qr"
+            android:enabled="true"
+            android:icon="@drawable/ic_camera_alt_black_24dp"
+            android:title="@string/qr_icon_title"/>
+
+    <item
+            android:id="@+id/nav_profile"
+            android:enabled="true"
+            android:icon="@drawable/ic_person_black_24dp"
+            android:title="@string/profile_icon_title"/>
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d5a721e..eb7e6e1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,28 +1,32 @@
 <resources>
     <string name="app_name">SpartaHack-Android</string>
-    <string name="navigation_drawer_open">Open navigation drawer</string>
-    <string name="navigation_drawer_close">Close navigation drawer</string>
-    <string name="nav_header_title">\@(Username/handle from api)</string>
-    <string name="nav_header_subtitle">(Email Address from api)</string>
-    <string name="nav_header_desc">Navigation header</string>
-    <string name="action_settings">Settings</string>
+    <string name="action_settings">Action settings</string>
 
-    <string name="menu_home">Home</string>
-    <string name="menu_maps">Maps</string>
-    <string name="menu_faq">FAQ</string>
-    <string name="menu_schedule">Schedule</string>
+    // Home fragment
+    <string name="timer_display_days">Days</string>
+    <string name="timer_display_hours">Hours</string>
+    <string name="timer_display_minutes">Minutes</string>
+    <string name="timer_display_seconds">Seconds</string>
+    <string name="timer_default">00:00:00:00</string>
 
-    <string name="faq_text_view">FAQ view</string>
 
-    <string name="Login">Login</string>
-    <string name="signUp">Sign Up</string>
-    <string name="username">Username</string>
-    <string name="password">Password</string>
-    <string name="or">or</string>
+    // Notifications
+    <string name="events_id">EVENT_ID</string>
+    <string name="events_name">Events</string>
+    <string name="events_description">Used for alerting the user for meals, tech talks, etc.</string>
+    <string name="capture">Capture</string>
+
+    // Bottom navigation
+    <string name="home_icon_title">Home</string>
+    <string name="map_icon_title">Map</string>
+    <string name="faq_icon_title">FAQ</string>
+    <string name="qr_icon_title">QR</string>
+    <string name="profile_icon_title">Profile</string>
 
     // Auth0
     <string name="com_auth0_client_id">5fHs0oCQswUEfYQAwyTrF6lpQJa5bbcA</string>
     <string name="com_auth0_domain">spartahack-dev.auth0.com</string>
     <string name="login">Log in</string>
     <string name="logout">Log out</string>
+
 </resources>
diff --git a/build.gradle b/build.gradle
index 187ed81..6da4977 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.60'
+    ext.kotlin_version = '1.3.61'
     repositories {
         google()
         jcenter()
+        maven { url 'https://dl.bintray.com/camerakit/camerakit-android'}
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.3'
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f5975d9..800a944 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Sep 05 14:57:04 EDT 2019
+#Sat Mar 07 14:12:23 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip