Added Sidebar Navigation and fixed layout CSS
Merge branch 'sidebar'