Modify styling of dashboard navigation sidebar
Change structure of sidebar, add search bar
Fix merge conflict in navigation
Merge branch 'master' of https://github.com/Tambling/whetstone