various navigation bar improvements; closes #163; closes #147
Merge remote-tracking branch 'origin/dev'