Navbar editing
Merge branch 'master' of https://github.com/sharamall/PELI
Merge branch 'master' of https://github.com/sharamall/PELI