More work on the options page.