fixed all navbars
Merge branch 'master' of https://github.com/aly006/ia_187
merge conflicts in index with points of difference