diff --git a/LocationRinger/AndroidManifest.xml b/LocationRinger/AndroidManifest.xml
index 35a193e..9169254 100644
--- a/LocationRinger/AndroidManifest.xml
+++ b/LocationRinger/AndroidManifest.xml
@@ -33,7 +33,7 @@
         android:label="@string/app_name"
         android:theme="@style/Theme.Custom" >
         <activity
-            android:name="LocationRinger"
+            android:name=".ui.ListActivity"
             android:configChanges="keyboard|orientation"
             android:label="@string/app_name" >
             <intent-filter>
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/LocationRinger.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/LocationRinger.java
deleted file mode 100644
index f2778ab..0000000
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/LocationRinger.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * LocationRinger.java
- * @date Apr 29, 2011
- * @author Twenty Codes, LLC
- * @author ricky barrette
- */
-package com.TwentyCodes.android.LocationRinger;
-
-import android.os.Bundle;
-
-import com.TwentyCodes.android.LocationRinger.ui.ListActivity;
-import com.TwentyCodes.android.exception.ExceptionHandler;
-
-/**
- * This is the main Activity for Location Ringer
- * @author ricky barrette
- */
-public class LocationRinger extends ListActivity {
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		Thread.setDefaultUncaughtExceptionHandler(new ExceptionHandler(this));
-		super.onCreate(savedInstanceState);
-	}
-}
\ No newline at end of file
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/LocationService.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/LocationService.java
index 7073955..733db0f 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/LocationService.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/services/LocationService.java
@@ -13,9 +13,9 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 
-import com.TwentyCodes.android.LocationRinger.LocationRinger;
 import com.TwentyCodes.android.LocationRinger.R;
 import com.TwentyCodes.android.LocationRinger.debug.Debug;
+import com.TwentyCodes.android.LocationRinger.ui.ListActivity;
 import com.TwentyCodes.android.LocationRinger.ui.SettingsActivity;
 import com.TwentyCodes.android.SkyHook.SkyHookService;
 import com.TwentyCodes.android.exception.ExceptionHandler;
@@ -71,7 +71,7 @@ public class LocationService extends SkyHookService {
 	private void startOnGoingNotification() {
 		this.mNotificationManager = (NotificationManager) this.getApplicationContext().getSystemService(Context.NOTIFICATION_SERVICE);
 		Notification notifyDetails = new Notification(R.drawable.icon, this.getString(R.string.app_name), System.currentTimeMillis());
-		PendingIntent intent = PendingIntent.getActivity(this, 0, new Intent(this, LocationRinger.class), android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
+		PendingIntent intent = PendingIntent.getActivity(this, 0, new Intent(this, ListActivity.class), android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
 		notifyDetails.setLatestEventInfo(this, this.getString(R.string.app_name), this.getString(R.string.gathering), intent);
 		notifyDetails.flags |= Notification.FLAG_ONGOING_EVENT;
 		this.mNotificationManager.notify(this.GATHERING_LOCATION_ONGING_NOTIFICATION_ID, notifyDetails);
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/RingerInformationActivity.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/RingerInformationActivity.java
index c9edc2e..90cc2e2 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/RingerInformationActivity.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/RingerInformationActivity.java
@@ -27,7 +27,6 @@ import android.view.MenuItem;
 import android.view.inputmethod.InputMethodManager;
 
 import com.TwentyCodes.android.LocationRinger.EnableScrollingListener;
-import com.TwentyCodes.android.LocationRinger.LocationRinger;
 import com.TwentyCodes.android.LocationRinger.OnContentChangedListener;
 import com.TwentyCodes.android.LocationRinger.R;
 import com.TwentyCodes.android.LocationRinger.db.RingerDatabase;
@@ -183,7 +182,7 @@ public class RingerInformationActivity extends FragmentActivity implements OnCon
 				save();
 				break;
 			case android.R.id.home:
-	            final Intent intent = new Intent(this, LocationRinger.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).putExtra(ListActivity.NO_SPLASH, ListActivity.NO_SPLASH);
+	            final Intent intent = new Intent(this, this.getClass()).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).putExtra(ListActivity.NO_SPLASH, ListActivity.NO_SPLASH);
 	            startActivity(intent);
 	            return true;
 		}
diff --git a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/SettingsActivity.java b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/SettingsActivity.java
index 7ce36ff..cf8655c 100644
--- a/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/SettingsActivity.java
+++ b/LocationRinger/src/com/TwentyCodes/android/LocationRinger/ui/SettingsActivity.java
@@ -26,7 +26,6 @@ import android.preference.Preference.OnPreferenceClickListener;
 import android.preference.PreferenceActivity;
 import android.view.MenuItem;
 
-import com.TwentyCodes.android.LocationRinger.LocationRinger;
 import com.TwentyCodes.android.LocationRinger.R;
 import com.TwentyCodes.android.LocationRinger.debug.Debug;
 
@@ -177,7 +176,7 @@ public class SettingsActivity extends PreferenceActivity implements OnPreference
 	public boolean onOptionsItemSelected(final MenuItem item) {
 		switch(item.getItemId()){
 			case android.R.id.home:
-	            final Intent intent = new Intent(this, LocationRinger.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).putExtra(ListActivity.NO_SPLASH, ListActivity.NO_SPLASH);
+	            final Intent intent = new Intent(this, ListActivity.class).addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP).putExtra(ListActivity.NO_SPLASH, ListActivity.NO_SPLASH);
 	            startActivity(intent);
 	            return true;
 		}