UI Improvements

 Tested: Android 2.2
         Android 4.4