[WIP] Index navigation improvements

Opening this to contain any discussion/feedback.

This is in LATEST builds.