Changing nav-bar (incomplete)
Merge branch 'master' of github.com:navidmatin/navidmatin