Update UI to work with main_app's changes for
a more uniform look.