Lots of cosmetic changes and some hacks related to the calendar