GUI and MVC work and refactoring