Revert "More UI tidying"

This reverts commit 9599fafe86f273c2c960dd2d3f639953c0e1d35c.