Fixed more navigation url bugs