Revert "Revert "More UI tidying""

This reverts commit 68e6cdc8d6caa90d3b6e890369acfafaa2404235.