Minor Tidy up of UI