Improve calendar with setup events and a new UI