Some more comments and refactoring of GUI classes