Added the events navigation, but missing proper styling
Merge remote-tracking branch 'origin/master'