Merge pull request #37 from Barrucadu/master

Add calendar
Make activities and so on more prominent
Remove duplication of information from activities page