More tidyups to the UI