Spot Check Changes and UI Cleanup
Version for Android development