Started GUI refactoring