Finish refactoring GUIs (untested)