cleaned up the UI a bit