some gui refactoring