Continuing GUI refactoring