Revised row.xml to match the UI