reorganize for options page