Changed the UI a bit