Merge pull request #9 from idiomatic/master

refactored sidebar et al.