Further GUI Rework