Added support for page to return where the user was when they leave