More formatting, including getting the "today" highlight correct