Add auto detecting navigation back