Tab refactor

I believe this is stray from the other refactoring work.  The nav focus was intentionally removed, as it inherits focus state already; however, this one needs to be re-added.