fixed content to top navbar
Merge origin/master