Updated UI for Android App