Cleanup the UI for better visibility

Test: Checked that everything looked correct visually
Change-Id: Id60e8a4f6d0e6c21bcae01ae90730e727c459f42
6 files changed