Cleaned GUI Manager code