Moved swap rows and columns to second page (#1553)