diff --git a/app/src/main/java/com/communistutopia/spacetrader/model/SolarSystem.kt b/app/src/main/java/com/communistutopia/spacetrader/model/SolarSystem.kt
index d398cfe..c815fa6 100644
--- a/app/src/main/java/com/communistutopia/spacetrader/model/SolarSystem.kt
+++ b/app/src/main/java/com/communistutopia/spacetrader/model/SolarSystem.kt
@@ -18,7 +18,6 @@ class SolarSystem(var planets: List<Planet>, var name: String, val x: Int,val  y
 
     /**
      * Function to calculate Euclidean distance between 2 Solar Systems
-     * TODO: Might want to place this in Companion obj. Equivalent to making it static. Not sure yet.
      *
      * @param other solar system to compare location to
      */
diff --git a/app/src/main/java/com/communistutopia/spacetrader/view/DebugGameFragment.kt b/app/src/main/java/com/communistutopia/spacetrader/view/DebugGameFragment.kt
index 6aeea59..4c9f618 100644
--- a/app/src/main/java/com/communistutopia/spacetrader/view/DebugGameFragment.kt
+++ b/app/src/main/java/com/communistutopia/spacetrader/view/DebugGameFragment.kt
@@ -29,7 +29,6 @@ class DebugGameFragment : Fragment() {
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         viewModel = ViewModelProviders.of(this).get(DebugGameViewModel::class.java)
-        // TODO: Use the ViewModel
         val solarSystems: List<SolarSystem> = ArrayList<SolarSystem>(viewModel.solarSystems)
         val adapter = SolarSystemAdapter(context!!, solarSystems)
         solar_systems_list.adapter = adapter
diff --git a/app/src/main/java/com/communistutopia/spacetrader/view/GameFragment.kt b/app/src/main/java/com/communistutopia/spacetrader/view/GameFragment.kt
index 45dc0e7..e6764bc 100644
--- a/app/src/main/java/com/communistutopia/spacetrader/view/GameFragment.kt
+++ b/app/src/main/java/com/communistutopia/spacetrader/view/GameFragment.kt
@@ -41,7 +41,6 @@ class GameFragment : Fragment() {
         // Start audio
         viewModel.goToSpace(context)
 
-        // TODO: Resource string placeholder
         // planet_name.text = "Planet: %s".format(viewModel.player.value?.location?.name)
 
         market_button.setOnClickListener {
diff --git a/app/src/main/java/com/communistutopia/spacetrader/view/LocationActivity.kt b/app/src/main/java/com/communistutopia/spacetrader/view/LocationActivity.kt
index 01e7c8b..a88561d 100644
--- a/app/src/main/java/com/communistutopia/spacetrader/view/LocationActivity.kt
+++ b/app/src/main/java/com/communistutopia/spacetrader/view/LocationActivity.kt
@@ -21,7 +21,7 @@ class LocationActivity: AppCompatActivity() {
     private lateinit var viewModel: LocationViewModel
     //lateinit var piratePopUp: PopupWindow
     //lateinit var policePopUp: PopupWindow
-    lateinit var closePopupBtn: Button
+    private lateinit var closePopupBtn: Button
 
 
     @SuppressLint("ResourceType")
@@ -67,8 +67,8 @@ class LocationActivity: AppCompatActivity() {
                 val layoutInflater =
                     this@LocationActivity.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
                 val customView = layoutInflater.inflate(R.layout.police_popup, null)
-                closePopupBtn = customView.findViewById<Button>(R.id.button_popup)
-                var popupWindow = PopupWindow(
+                closePopupBtn = customView.findViewById(R.id.button_popup)
+                val popupWindow = PopupWindow(
                     customView,
                     LinearLayout.LayoutParams.WRAP_CONTENT,
                     LinearLayout.LayoutParams.WRAP_CONTENT
@@ -104,8 +104,8 @@ class LocationActivity: AppCompatActivity() {
                 val layoutInflater =
                     this@LocationActivity.getSystemService(Context.LAYOUT_INFLATER_SERVICE) as LayoutInflater
                 val customView = layoutInflater.inflate(R.layout.pirate_popup, null)
-                var closePopupBtn = customView.findViewById<Button>(R.id.button_popup)
-                var popupWindow = PopupWindow(
+                val closePopupBtn = customView.findViewById<Button>(R.id.button_popup)
+                val popupWindow = PopupWindow(
                     customView,
                     LinearLayout.LayoutParams.WRAP_CONTENT,
                     LinearLayout.LayoutParams.WRAP_CONTENT
diff --git a/app/src/main/java/com/communistutopia/spacetrader/view/LoginActivity.kt b/app/src/main/java/com/communistutopia/spacetrader/view/LoginActivity.kt
index c5727d0..5a82081 100644
--- a/app/src/main/java/com/communistutopia/spacetrader/view/LoginActivity.kt
+++ b/app/src/main/java/com/communistutopia/spacetrader/view/LoginActivity.kt
@@ -108,7 +108,6 @@ class LoginActivity : AppCompatActivity() {
                     authSuccess(user!!)
                 } else {
                     // If sign in fails, display a message to the user.
-                    // TODO: Make this a toast or something
                     Log.w("signInWithCredential:failure", task.exception)
                 }
             }
@@ -128,7 +127,6 @@ class LoginActivity : AppCompatActivity() {
 
             } catch (e: ApiException) {
                 // Google Sign In failed, update UI appropriately
-                // TODO: A toast or something
                 Log.w( "Google sign in failed", e)
             }
         }
diff --git a/app/src/main/java/com/communistutopia/spacetrader/view/MainActivity.kt b/app/src/main/java/com/communistutopia/spacetrader/view/MainActivity.kt
index 58c5b1f..2f5995b 100644
--- a/app/src/main/java/com/communistutopia/spacetrader/view/MainActivity.kt
+++ b/app/src/main/java/com/communistutopia/spacetrader/view/MainActivity.kt
@@ -13,7 +13,6 @@ class MainActivity : AppCompatActivity() {
         setContentView(R.layout.activity_main)
 
         /** Go to the configuration activity
-         * TODO: In the future it needs to decide which screen to go on based on state. Is there a user? Then don't
          * go to the config screen.
          */
         FirebaseApp.initializeApp(this)
diff --git a/app/src/main/java/com/communistutopia/spacetrader/viewmodel/MarketplaceViewModel.kt b/app/src/main/java/com/communistutopia/spacetrader/viewmodel/MarketplaceViewModel.kt
index ef830bb..b1801a6 100644
--- a/app/src/main/java/com/communistutopia/spacetrader/viewmodel/MarketplaceViewModel.kt
+++ b/app/src/main/java/com/communistutopia/spacetrader/viewmodel/MarketplaceViewModel.kt
@@ -39,7 +39,6 @@ class MarketplaceViewModel : ViewModel() {
     /**
      * A function that sells goods to a Market
      * A player cannot sell a good if the planet's tech level is too low or if they do not have enough money
-     * TODO add error messages so the player knows why they cannot sell an item in view
      * @param tradeGood the good being sold
      * @param numGoods the number of things being sold
      * @return true if action was successful, false otherwise
diff --git a/app/src/main/res/drawable/launch_screen.xml b/app/src/main/res/drawable/launch_screen.xml
index 3249e17..e12025c 100644
--- a/app/src/main/res/drawable/launch_screen.xml
+++ b/app/src/main/res/drawable/launch_screen.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
 <item>
-    <color android:color="@color/background_material_light"/>
+    <color android:color="@color/white"/>
 </item>
 <item>
     <bitmap
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index de2e05b..5df95ae 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -19,6 +19,7 @@
             app:layout_constraintStart_toStartOf="parent" app:layout_constraintHorizontal_bias="0.982"/>
     <ImageView
             android:layout_width="281dp"
+            android:contentDescription="Space Trader"
             android:layout_height="108dp" app:srcCompat="@drawable/app"
             android:id="@+id/imageView2" app:layout_constraintTop_toTopOf="parent"
             android:layout_marginTop="268dp" app:layout_constraintEnd_toEndOf="parent" android:layout_marginEnd="65dp"
diff --git a/app/src/main/res/layout/configuration_fragment.xml b/app/src/main/res/layout/configuration_fragment.xml
index 1968006..d0b2eb1 100644
--- a/app/src/main/res/layout/configuration_fragment.xml
+++ b/app/src/main/res/layout/configuration_fragment.xml
@@ -15,6 +15,7 @@
             android:layout_height="103dp"
             android:backgroundTint="@color/white"
             android:hint="Enter your name player!"
+            android:importantForAutofill="no"
             android:textColor="@color/white"
             android:inputType="text"
             android:id="@+id/player_name"/>
@@ -26,11 +27,13 @@
             android:textColor="@color/white"
             android:textColorHint="@color/white"
             android:hint="Enter number of pilot points"
+            android:importantForAutofill="no"
             android:inputType="number"
             android:id="@+id/pilot_points"/>
 
     <EditText
             android:layout_width="match_parent"
+            android:importantForAutofill="no"
             android:layout_height="88dp"
             android:backgroundTint="@color/white"
             android:fontFamily="@font/andromeda"
@@ -46,6 +49,7 @@
             android:fontFamily="@font/andromeda"
             android:backgroundTint="@color/white"
             android:textColor="@color/white"
+            android:importantForAutofill="no"
             android:textColorHint="@color/white"
             android:hint="Enter number of trader points"
             android:inputType="number"
@@ -59,6 +63,7 @@
             android:textColorHint="@color/white"
             android:textColor="@color/white"
             android:hint="Enter number of engineer points"
+            android:importantForAutofill="no"
             android:inputType="number"
             android:id="@+id/engineer_points"/>
 
@@ -75,8 +80,7 @@
             android:layout_height="25dp"
             android:font="@font/andromeda"
             android:background="@color/white"
-            android:id="@+id/difficulty_spinner"
-            android:layout_below="@+id/difficulty_text"/>
+            android:id="@+id/difficulty_spinner"/>
     <Button
             android:text="Finish"
             android:textColor="@color/white"
diff --git a/app/src/main/res/layout/difficulty_spinner.xml b/app/src/main/res/layout/difficulty_spinner.xml
deleted file mode 100644
index d6e1438..0000000
--- a/app/src/main/res/layout/difficulty_spinner.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<Spinner
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:id="@+id/spinner"
-        android:textSize="20sp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-          android:id="@android:id/text1"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:textSize="15sp"
-          android:fontFamily="@font/andromeda"
-          android:textColor="@color/white" />
-
-</Spinner>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_solarsystem.xml b/app/src/main/res/layout/list_item_solarsystem.xml
index 2e33b7e..e3d1ce6 100644
--- a/app/src/main/res/layout/list_item_solarsystem.xml
+++ b/app/src/main/res/layout/list_item_solarsystem.xml
@@ -4,17 +4,9 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-
-    <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:orientation="vertical">
-
         <TextView
                 android:id="@+id/obj_string"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
         />
-    </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/location_activity.xml b/app/src/main/res/layout/location_activity.xml
index d672c11..a3473ec 100644
--- a/app/src/main/res/layout/location_activity.xml
+++ b/app/src/main/res/layout/location_activity.xml
@@ -9,6 +9,7 @@
             android:layout_height="0dp"
             android:src="@drawable/transport"
             android:scaleType="centerCrop"
+            android:contentDescription="space system"
             android:id="@+id/transport"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 47c8224..26c4166 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,5 +1,4 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0d0bffd..d357589 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,27 +2,5 @@
     <string name="app_name">Space Trader</string>
     <string name="travelBtnStr">Travel</string>
     <string name="marketBtnStr">Market</string>
-    <string name="shipyardBtnStr">Shipyard</string>
-    <string name="playerBtnStr">Player Info</string>
-    <string name="debugBtnStr">Debug Info</string>
-    <string name="newgame">NEW GAME</string>
-    <string name="loadgame">LOAD GAME</string>
-    <string name="savegame">SAVE GAME</string>
-    <string name="selection">Please Select/Save Your Game Below!</string>
-    <string name="haley">Haley</string>
-    <string name="Drake">Drake</string>
-    <string name="Rohan">Rohan</string>
-    <string name="loadsave">LOAD/SAVE GAME</string>
-    <string name="title_activity_google_login">Sign in</string>
-    <!-- Strings related to login -->
-    <string name="prompt_email">Email</string>
-    <string name="prompt_password">Password (optional)</string>
-    <string name="action_sign_in">Sign in or register</string>
-    <string name="action_sign_in_short">Sign in</string>
-    <string name="error_invalid_email">This email address is invalid</string>
-    <string name="error_invalid_password">This password is too short</string>
-    <string name="error_incorrect_password">This password is incorrect</string>
-    <string name="error_field_required">This field is required</string>
-    <string name="permission_rationale">"Contacts permissions are needed for providing email completions."</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4400a2c..619f1b9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,12 +13,5 @@
         <item name="android:windowBackground">@drawable/launch_screen</item>
     </style>
 
-    <style name="TextAppearance.AppCompat.Widget.TextView.SpinnerItem."
-           parent="@android:style/Widget.Holo.DropDownItem.Spinner">
-    <item name="android:textColor">@color/white</item>
-        <item name="android:fontFamily">@font/andromeda</item>
-
-    </style>
-
 
 </resources>