Changes to navigation bar
Merge branch 'edge' of github.com:chisimba/chisimba into edge