Changes to sidebar nav and navbar css
Merge branch 'feature'