Changes and comments to MainFrame