Navigation design improvement