diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f379dd8..8d40e04 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,6 +16,8 @@
 		android:label="@string/app_name"
 		android:supportsRtl="true"
 		android:theme="@style/AppTheme">
+
+		<!-- Login Activity -->
 		<activity android:name=".LoginActivity">
 			<intent-filter android:label="@string/app_name">
 				<action android:name="android.intent.action.MAIN"/>
@@ -23,8 +25,9 @@
 				<category android:name="android.intent.category.LAUNCHER"/>
 			</intent-filter>
 		</activity>
-		<activity
-			android:name=".SettingsActivity"
+
+		<!-- Settings Activity -->
+		<activity android:name=".SettingsActivity"
 			android:label="@string/settings_name"
 			android:parentActivityName=".LoginActivity">
 
@@ -34,14 +37,13 @@
 				android:value=".LoginActivity"/>
 		</activity>
 
-		<service
-			android:name=".LocationService"
+		<!-- Location Service -->
+		<service android:name=".LocationService"
 			android:exported="false">
 		</service>
 
-		<!--Startup on boot-->
-		<receiver
-			android:name=".BootReceiver"
+		<!-- Startup on boot -->
+		<receiver android:name=".BootReceiver"
 			android:enabled="true"
 			android:exported="true"
 			android:permission="android.permission.RECEIVE_BOOT_COMPLETED">
@@ -53,9 +55,8 @@
 			</intent-filter>
 		</receiver>
 
-		<!--Check for Disconnection-->
-		<receiver
-			android:name=".ConnectionReceiver"
+		<!-- Check for Disconnection -->
+		<receiver android:name=".ConnectionReceiver"
 			android:enabled="true"
 			android:exported="true">
 			<intent-filter>
diff --git a/app/src/main/java/us/keithirwin/tracman/LocationService.java b/app/src/main/java/us/keithirwin/tracman/LocationService.java
index e67a7ad..54d636b 100644
--- a/app/src/main/java/us/keithirwin/tracman/LocationService.java
+++ b/app/src/main/java/us/keithirwin/tracman/LocationService.java
@@ -44,8 +44,8 @@ public class LocationService extends Service implements GoogleApiClient.Connecti
 	public LocationService() {}
 	private String TAG = "LocationService";
 	final static private int ICON_ON = 2;
-	final int ICON_HALF = 1;
-	final int ICON_OFF = 0;
+	final static private int ICON_HALF = 1;
+	final static private int ICON_OFF = 0;
 	// Development
 	final String SERVER_ADDRESS = "https://dev.tracman.org";
 	// Production
diff --git a/build.gradle b/build.gradle
index 4f5127c..cc079e0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:2.3.1'
+		classpath 'com.android.tools.build:gradle:2.3.2'
 		classpath 'com.google.gms:google-services:3.0.0'
 
 		// NOTE: Do not place your application dependencies here; they belong