Updted full calendar enhancements