fixed sidenav
Merge branch 'dev'