Options update and reordering