gui refactoring
7 files changed