Fixed calendar current month and year highlighted properly