GUI improvement, refactoring