Continues GUI Refactoring

Done — I think.