Improved back-button functionality.