diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 68e4a82..7abd311 100644
Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ
diff --git a/app/src/main/java/edu/gatech/team83/donationtracker/controller/LocationRecyclerActivity.java b/app/src/main/java/edu/gatech/team83/donationtracker/controller/LocationRecyclerActivity.java
index a0495b0..c4731ae 100644
--- a/app/src/main/java/edu/gatech/team83/donationtracker/controller/LocationRecyclerActivity.java
+++ b/app/src/main/java/edu/gatech/team83/donationtracker/controller/LocationRecyclerActivity.java
@@ -54,7 +54,7 @@ public void onBackPressed(View v) {
         if (getIntent().hasExtra("Act") && getIntent().getStringExtra("Act").equals("SearchActivity")) {
             Intent intent = new Intent(context, SearchActivity.class);
         }
-        Intent intent = new Intent(context, WelcomeActivity.class);
+        Intent intent = new Intent(context, AppLandingActivity.class);
         startActivity(intent);
     }
 
diff --git a/app/src/main/res/layout/inventory_list.xml b/app/src/main/res/layout/inventory_list.xml
index c96209a..b6502cd 100644
--- a/app/src/main/res/layout/inventory_list.xml
+++ b/app/src/main/res/layout/inventory_list.xml
@@ -12,7 +12,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginTop="15dp"
         android:layout_marginBottom="80dp"
-        app:layoutManager="LinearLayoutManager"
+        app:layoutManager="android.support.v7.widget.LinearLayoutManager"
         tools:context="cs2340.gatech.edu.lab3.controllers.CourseListActivity"
         tools:listitem="@layout/inventory_list_item">
 
@@ -29,14 +29,15 @@
         android:id="@+id/add_item_button"
         android:onClick="onAddItemPressed"/>
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="25dp"
-        android:text="Back"
-        android:layout_marginStart="30dp"
+    <android.support.design.widget.FloatingActionButton
         android:id="@+id/log_out_button"
-        android:onClick="onBackToInventoryPressed"/>
+        android:layout_width="124dp"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@+id/add_item_button"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="34dp"
+        android:clickable="true"
+        android:onClick="onBackToInventoryPressed"
+        app:srcCompat="@android:drawable/ic_menu_revert" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_detail.xml b/app/src/main/res/layout/item_detail.xml
index 4f531f1..08c69e0 100644
--- a/app/src/main/res/layout/item_detail.xml
+++ b/app/src/main/res/layout/item_detail.xml
@@ -1,5 +1,6 @@
 <?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="match_parent"
     android:gravity="center_vertical|center_horizontal"
@@ -77,12 +78,12 @@
         android:text="Delete Item"
         android:onClick="onDeleteItemPressed" />
 
-    <Button
+
+    <android.support.design.widget.FloatingActionButton
         android:id="@+id/item_back_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Back"
-        android:onClick="onBackItemPressed">
-
-    </Button>
+        android:clickable="true"
+        app:srcCompat="@android:drawable/ic_menu_revert"
+        android:onClick="onBackItemPressed"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/location_detail.xml b/app/src/main/res/layout/location_detail.xml
index 11d50e5..83c6d93 100644
--- a/app/src/main/res/layout/location_detail.xml
+++ b/app/src/main/res/layout/location_detail.xml
@@ -1,5 +1,6 @@
 <?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="match_parent"
     android:gravity="center_vertical|center_horizontal"
@@ -57,22 +58,23 @@
         android:id="@+id/location_edit_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Edit Location"
-        android:onClick="onEditLocationPressed"/>
+        android:onClick="onEditLocationPressed"
+        android:text="Edit Location" />
 
     <Button
         android:id="@+id/inventory_view_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="View Inventory"
-        android:onClick="onViewInventoryPressed"/>
+        android:onClick="onViewInventoryPressed"
+        android:text="View Inventory" />
 
-    <Button
+    <android.support.design.widget.FloatingActionButton
         android:id="@+id/location_back_button"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Back"
-        android:onClick="onBackPressed">
+        android:baselineAligned="false"
+        android:clickable="true"
+        android:onClick="onBackPressed"
+        app:srcCompat="@android:drawable/ic_menu_revert" />
 
-    </Button>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/location_list.xml b/app/src/main/res/layout/location_list.xml
index 6c3d972..6edf69b 100644
--- a/app/src/main/res/layout/location_list.xml
+++ b/app/src/main/res/layout/location_list.xml
@@ -12,7 +12,7 @@
         android:layout_alignParentBottom="true"
         android:layout_marginTop="15dp"
         android:layout_marginBottom="80dp"
-        app:layoutManager="LinearLayoutManager"
+        app:layoutManager="android.support.v7.widget.LinearLayoutManager"
         tools:context="cs2340.gatech.edu.lab3.controllers.CourseListActivity"
         tools:listitem="@layout/location_list_item">
 
@@ -29,14 +29,16 @@
         android:id="@+id/add_location_button"
         android:onClick="onAddLocationPressed"/>
 
-    <Button
-        android:id="@+id/log_out_button"
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/floatingActionButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="25dp"
-        android:layout_marginStart="30dp"
+        android:layout_alignBottom="@+id/add_location_button"
+        android:layout_alignParentStart="true"
+        android:layout_marginStart="39dp"
+        android:clickable="true"
         android:onClick="onBackPressed"
-        android:text="Back" />
+        app:srcCompat="@android:drawable/ic_menu_revert" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/search_view.xml b/app/src/main/res/layout/search_view.xml
index c8869b0..315fd0f 100644
--- a/app/src/main/res/layout/search_view.xml
+++ b/app/src/main/res/layout/search_view.xml
@@ -22,17 +22,6 @@
         app:layout_constraintTop_toBottomOf="@+id/textView10"
         app:layout_constraintVertical_bias="0.378" />
 
-    <Button
-        android:id="@+id/back_search_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:layout_marginStart="16dp"
-        android:onClick="onBackSearchButton"
-        android:text="Back"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-
     <Button
         android:id="@+id/search_loc_button"
         android:layout_width="88dp"
@@ -138,4 +127,20 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.028"
         app:layout_constraintStart_toStartOf="parent" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/back_search_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:layout_marginEnd="328dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="90dp"
+        android:clickable="true"
+        android:onClick="onBackSearchButton"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/editText"
+        app:srcCompat="@android:drawable/ic_menu_revert" />
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file