Improvements to calendar