More work on the options panel.