Update Navbar
Side Nav fix
Merge pull request #1 from Mikescops/master

Corrections of navs