Reorder how section choices appear in the builder
Update the list of available templates