FIxed up navigation via combos