Calendar page now does recurring events.
Whitespace fixes and merge.