implemented correct back navigation