Add support for reordering forms