Navigation flow now working