Sorry I had a ton of merge conflicts and I kept the div.row's even though you might not have wanted them...