Reworked GUI