Some gui refactoring.