Fix settings form close button.
Replace history with on-page display.