diff --git a/Grid.js b/Grid.js
index 706de13eb..121ab44d6 100644
--- a/Grid.js
+++ b/Grid.js
@@ -1,5 +1,5 @@
-define(["dojo/_base/kernel", "dojo/_base/declare", "dojo/on", "dojo/has", "put-selector/put", "./List", "dojo/_base/sniff"],
-function(kernel, declare, listen, has, put, List){
+define(["dojo/_base/kernel", "dojo/_base/declare", "dojo/on", "dojo/has", "put-selector/put", "./List", "dojo/query", "dojo/_base/sniff"],
+function(kernel, declare, listen, has, put, List, query){
 	var contentBoxSizing = has("ie") < 8 && !has("quirks");
 	var invalidClassChars = /[^\._a-zA-Z0-9-]/g;	
 	function appendIfNode(parent, subNode){
@@ -39,7 +39,6 @@ function(kernel, declare, listen, has, put, List){
 			}
 			var element;
 			if(target.nodeType){
-				var object;
 				do{
 					if(this._rowIdToObject[target.id]){
 						break;
@@ -57,13 +56,7 @@ function(kernel, declare, listen, has, put, List){
 				var row = this.row(target),
 					rowElement = row.element;
 				if(rowElement){ 
-					var elements = rowElement.getElementsByTagName("td");
-					for(var i = 0; i < elements.length; i++){
-						if(elements[i].columnId == columnId){
-							element = elements[i];
-							break;
-						}
-					}
+					element = query('.field-' + columnId, rowElement)[0];
 				}
 			}
 			if(target != null){
@@ -89,7 +82,6 @@ function(kernel, declare, listen, has, put, List){
 			// summary:
 			//		Generates the grid for each row (used by renderHeader and and renderRow)
 			var row = put("table.dgrid-row-table[role=presentation]"),
-				cellNavigation = this.cellNavigation,
 				// IE < 9 needs an explicit tbody; other browsers do not
 				tbody = (has("ie") < 9 || has("quirks")) ? put(row, "tbody") : row,
 				tr,
@@ -178,7 +170,6 @@ function(kernel, declare, listen, has, put, List){
 			//		Setup the headers for the grid
 			var
 				grid = this,
-				columns = this.columns,
 				headerNode = this.headerNode,
 				i = headerNode.childNodes.length;