Massive GUI refactoring