Massive UI tidy up