Some tidying of the UI