FINALLY fixed i11y of nav