Reordering layouts once more.