added improved navigation with the 'back' button