Basic UI Cleanup

General cleanup of the UI