gui refactoring
refact
fix
style fix