Cleaning up UI

Bunch of UI improvements for visual appeal and consistency.