Navigation self options improvement