Cleaned GUI a bit.