fixes sidebar navigation
fixes sidebar navigation
fixes merge conflict
Merge pull request #179 from chadbrading/master

fixes sidebar