Reworked the UI a lot