refactoring; draft of bucketnav (no new design)
Merge branch 'master' of https://github.com/carneades/carneades