Update default screens to new UI