cleaned up the UI a little