Updated the tabs, and some partial html files
Merge origin/master
Updated tabs again, added header to events page