Updated the UI a bit