Starting gui refactoring.