Finished breaking out the rows into separate components