GUI reworked