Updating to new UI design