Calender and management.js updates