Fix nav
Add sidebar
Include Sidebar