A few tweaks to .calendar and .menu