fix navbar template
fix navbar template
update readme
Merge branch 'dev'