corrected navigation on back button