styling navbar and sidevar
Merge remote-tracking branch 'origin/master'