working on #54
merge conflicts resolved, sidebar additional links