misc fixes & moved grid back from listing templates back to cor