Navigation tabs refactor