Changed rows to be created from xml

Still have padding and margin issues