Fixed the navigate back problem!