Got the columns working and a couple of other tweaks