Captions are now removed from tab order when hidden
Refactored navigation feature