Different GUI refactoring