Cleaned up the UI a bit