Cleanup of GUI classes
Merge with Master