Tidying and minor UI improvements