Nav-tab fix
Added a TODO