Fixes and improves sidebar_nav