updates in calendar directive and page 2