Updates to main Android app

Updated the UI in multiple places.