Fixed up the UI a bit