Gui refactoring
Gui refactoring