Add Top NavBAR
Merge branch 'dev'