Fixed some variable naming anomalies, got the basic site working with the new grid