UI updates

Various updates to clean up the UI in preperation for handling user configuration.