Add calendar, fix JS links
Merge