Merge tag '2blank-index' into development

2.1
so far so good
DRY up the nav, fix issue #2