Bumped all sidebar/navigation logic into sidebar element