changed navigation order