More work for options page. Still needs a lot of loving.