Tidy up the ui a bit.