6. GUI Refactoring continue...