Less awkward navigation design