Tabbed up Calendar.html, overally trying to clean up existing code