Much simpler viewport tag
Rewrite calendar code
Merge branch 'date'