navbar fix and added smart text
Merge branch 'round' into testing