Reworked the UI a bit