updated site content
updated top navbar
Merge branch 'dev'