Cleaned GUI up