Cup and new UI updates