Removed references to cookie
Fixed demo to return to previous page