GUI & Refactoring