Made a few tweaks related to the calendar widget