Reworked the GUI