Tidying up the new UI design in preparation for adding more elements.