Tidied new UI