Fixed sidenav width overflow
Merge branch 'fix-sidenav-overflow'