diff --git a/static/wymeditor/skins/galaxy/icons.png b/static/wymeditor/skins/galaxy/icons.png
index a9cae0d9d02..8c8aed9f76f 100644
Binary files a/static/wymeditor/skins/galaxy/icons.png and b/static/wymeditor/skins/galaxy/icons.png differ
diff --git a/static/wymeditor/skins/galaxy/skin.css b/static/wymeditor/skins/galaxy/skin.css
index 95bbe0a3db1..c28f03251ae 100644
--- a/static/wymeditor/skins/galaxy/skin.css
+++ b/static/wymeditor/skins/galaxy/skin.css
@@ -109,7 +109,8 @@
         .wym_skin_galaxy .wym_buttons li.wym_tools_paste a         { background-position: 0 -552px;}
         .wym_skin_galaxy .wym_buttons li.wym_tools_html a          { background-position: 0 -193px;}
         .wym_skin_galaxy .wym_buttons li.wym_tools_preview a       { background-position: 0 -408px;}
-        .wym_skin_galaxy .wym_buttons li.galaxy_tools_insert_history_link a   { background-position: 0 -622px;}
+        .wym_skin_galaxy .wym_buttons li.galaxy_tools_insert_history_link a   { background-position: 0 -646px;}
+        .wym_skin_galaxy .wym_buttons li.galaxy_tools_annotate_history a   { background-position: 0 -622px;}
 
 /*DECORATION*/
         .wym_skin_galaxy .wym_section h2             { background: #f0f0f0; border: solid gray; border-width: 0 0 1px;}
diff --git a/templates/grid_base.mako b/templates/grid_base.mako
index c2892cfd7b4..d45070afd1b 100644
--- a/templates/grid_base.mako
+++ b/templates/grid_base.mako
@@ -949,7 +949,13 @@ ${self.render_grid_table()}
         </tr>    
     %endif
     ## Grid operations.
-    %if grid.operations:
+    <%
+        num_allow_multiple_ops = 0
+        for operation in grid.operations:
+            if operation.allow_multiple:
+                num_allow_multiple_ops += 1
+    %>
+    %if num_allow_multiple_ops:
         <tr>
             <td></td>
             <td colspan="100">
diff --git a/templates/page/history_annotation_table.mako b/templates/page/history_annotation_table.mako
index b6c252751c2..27e6afdbbcb 100644
--- a/templates/page/history_annotation_table.mako
+++ b/templates/page/history_annotation_table.mako
@@ -8,7 +8,7 @@
     </tr>
     <tr>
         ## Status messages and tags.
-        <th colspan='2'>
+        <td colspan='2'>
             %if history.deleted:
                 <div class="warningmessagesmall">
                     ${_('This is a deleted history.')}
@@ -17,17 +17,17 @@
             %if trans.get_user() is not None:
                 Tags: ${render_tagging_element_html( tags=history.tags, editable=False, use_toggle_link=False )}
             %endif
-        </th>
+        </td>
     </tr>
     <tr>
-        <th colspan="2">Description of History: 
+        <td colspan="2" class="annotation">Description of History: 
             <ol>
                 <li>What was the motivation for this history?
                 <li>What is the outcome of this history?
                 <li>What are unresolved questions from this history?
                 <li>What new questions arise from this history?
             </ol>
-        </th>
+        </td>
     </tr>
     
     ## Table body. For each dataset, there is an area to annotate the dataset.
@@ -44,7 +44,7 @@
         %for data in datasets:
             %if data.visible:
             <tr>
-                <td valign="top"><span class="annotation">Describe this step: why was it done? what data does it produce?</span></td>
+                <td valign="top"><span class="annotation">Describe this step: why was it done? what data did it produce?</span></td>
                 ##<td valign="top" class="annotation">Describe this step: why was it done? what data does it produce?</td>
                 <td>
                     <div class="historyItemContainer" id="historyItemContainer-${data.id}">