Add visibility of year on calendar heading
Calendar year changes appropriately
Refactor calendar year