Rearranged edit template