diff --git a/composer/schema/browser/schema_macros.pt b/composer/schema/browser/schema_macros.pt
index 970f5bc..f3a1139 100755
--- a/composer/schema/browser/schema_macros.pt
+++ b/composer/schema/browser/schema_macros.pt
@@ -59,7 +59,7 @@
         </tal:errors>
         <tr>
           <tal:field>
-            <td style="padding: 4px; border-top: none"
+            <td style="padding: 4px; border-top: none; vertical-align: top"
                 tal:attributes="title field/description">
               <b tal:content="field/title">...</b><span
                     tal:condition="field/required">&nbsp;*</span>
diff --git a/composer/schema/grid/field.py b/composer/schema/grid/field.py
index 633e69b..72dde93 100644
--- a/composer/schema/grid/field.py
+++ b/composer/schema/grid/field.py
@@ -64,7 +64,7 @@ class GridFieldInstance(ListFieldInstance):
         for row in v:
             for k, vr in row.items():
                 if isinstance(vr, basestring):
-                    row[k] = vr.replace('\n', '\\n')
+                    row[k] = vr.replace('\n', '\\n').replace('"', '\\"')
         empty = {}
         for fi in self.columnFieldInstances:
             default = fi.default
diff --git a/composer/schema/grid/grid_macros.pt b/composer/schema/grid/grid_macros.pt
index 53fd83f..09d3ac7 100755
--- a/composer/schema/grid/grid_macros.pt
+++ b/composer/schema/grid/grid_macros.pt
@@ -21,7 +21,7 @@
     <textarea rows="3" style="display: none"
               tal:attributes="name name; id name">
     </textarea>
-    <table dojoType="dojox.grid.DataGrid" query="{name: '*'}"
+    <table dojoType="dojox.grid.DataGrid"
            style="width: 100%; height: 12em"
            singleClickEdit="true"
            tal:attributes="id string:grid_$name;
@@ -34,9 +34,9 @@
                 tal:content="column/title">Column Title</th>
           </tal:header>
         </tr></thead>
-    </table>
+    </table><br />
 </metal:input>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>