rearrange/add options, update css