Test
Attempt to merge new side-nav
Finished product w sidenav
Merge branch 'Steve'