refactoring of GUI classes