Re-order & re-group options