diff --git a/webapp/web/admin/sparql.jsp b/webapp/web/admin/sparql.jsp
index b1e2d7d08..77b48dadc 100644
--- a/webapp/web/admin/sparql.jsp
+++ b/webapp/web/admin/sparql.jsp
@@ -49,7 +49,7 @@ td {
 			</tr>
 		</table>
 		<div>
-			<input type="button" id="submit" value="Generate Query" onclick="genQuery();" />
+			<input type="button" class="submit" value="Generate Query" onclick="genQuery();" />
 		</div>
 		<div id="sparqlquery" style="visibility: hidden;">
 			<form action="sparqlquery">
@@ -158,7 +158,7 @@ td {
 					</ul>
 
 				</div>
-				<input type="submit" value="Run Query" id="submit">
+				<input type="submit" value="Run Query" class="submit">
 			</form>
 		</div>
 	</div>
diff --git a/webapp/web/admin/sparqlquery/sparqlForm.jsp b/webapp/web/admin/sparqlquery/sparqlForm.jsp
index 53f46aa5b..35dc0208a 100644
--- a/webapp/web/admin/sparqlquery/sparqlForm.jsp
+++ b/webapp/web/admin/sparqlquery/sparqlForm.jsp
@@ -89,7 +89,7 @@ LIMIT 20
 	</ul>
 </div>
 
-<input id="submit" type="submit" value="Run Query" />
+<input class="submit" type="submit" value="Run Query" />
 </form>
 <%--
 <h4>Notes</h4>
diff --git a/webapp/web/commentsForm.jsp b/webapp/web/commentsForm.jsp
index 9a4d47f3d..83d4dba7e 100644
--- a/webapp/web/commentsForm.jsp
+++ b/webapp/web/commentsForm.jsp
@@ -64,8 +64,8 @@
 
 		<textarea name="s34gfd88p9x1" rows="10" cols="90"></textarea>
 		<div>
-  		<input type="submit" id="submit" value="Send Mail" />
-  		<input type="reset" id="delete" value="Clear Form" />
+  		<input type="submit" class="submit" value="Send Mail" />
+  		<input type="reset" class="delete" value="Clear Form" />
 		</div
 
 		<p style="font-weight: bold; margin-top: 1em">Thank you!</p>
diff --git a/webapp/web/fileupload/datastreamModification.jsp b/webapp/web/fileupload/datastreamModification.jsp
index b68c8f6e0..15ab6c109 100644
--- a/webapp/web/fileupload/datastreamModification.jsp
+++ b/webapp/web/fileupload/datastreamModification.jsp
@@ -20,5 +20,5 @@
     <input type="hidden" name="dsid" value="${dsid}"/>
     <!--Adding use new name set to true so that it is overwritten correctly-->
 	<input type="hidden" name="useNewName" value="true"/>
-    <input type="submit" id="submit" value="submit" />
+    <input type="submit" class="submit" value="submit" />
   </form>
diff --git a/webapp/web/jenaIngest/connectDB.jsp b/webapp/web/jenaIngest/connectDB.jsp
index 699ac84ed..75477049a 100644
--- a/webapp/web/jenaIngest/connectDB.jsp
+++ b/webapp/web/jenaIngest/connectDB.jsp
@@ -37,4 +37,4 @@
     </select>
 
 
-    <input id="submit" type="submit" value="Connect Database" />
+    <input class="submit" type="submit" value="Connect Database" />
diff --git a/webapp/web/jenaIngest/createModel.jsp b/webapp/web/jenaIngest/createModel.jsp
index 31a36ca51..a873f7662 100644
--- a/webapp/web/jenaIngest/createModel.jsp
+++ b/webapp/web/jenaIngest/createModel.jsp
@@ -5,6 +5,6 @@
     <form style="margin-bottom:2ex;" action="ingest" method="post">
         <input type="hidden" name="action" value="createModel"/>
 	Model name: <input type="text" size="32" name="modelName"/>
-        <input id="submit" type="submit" name="submit" value="Create Model"/>
+        <input class="submit" type="submit" name="submit" value="Create Model"/>
         <input type="hidden" name="modelType" value="${modelType}"/>
     </form>
diff --git a/webapp/web/jenaIngest/csv2rdf.jsp b/webapp/web/jenaIngest/csv2rdf.jsp
index 46ed2caae..ad68d3903 100644
--- a/webapp/web/jenaIngest/csv2rdf.jsp
+++ b/webapp/web/jenaIngest/csv2rdf.jsp
@@ -65,4 +65,4 @@
     </select>
     <p>Destination Model for TBox</p>
 
-    <input id="submit" type="submit" value="Next Step"/>
+    <input class="submit" type="submit" value="Next Step"/>
diff --git a/webapp/web/jenaIngest/csv2rdfSelectUri.jsp b/webapp/web/jenaIngest/csv2rdfSelectUri.jsp
index e184d973f..a5be03dd6 100644
--- a/webapp/web/jenaIngest/csv2rdfSelectUri.jsp
+++ b/webapp/web/jenaIngest/csv2rdfSelectUri.jsp
@@ -77,7 +77,7 @@ function disableProperties(){
     
    <input type="hidden" name="destinationModelName" value="<%=modelName%>"/>
     
-    <input id="submit" type="submit" value="Convert CSV"/>
+    <input class="submit" type="submit" value="Convert CSV"/>
     
     </form>
     
diff --git a/webapp/web/jenaIngest/executeWorkflow.jsp b/webapp/web/jenaIngest/executeWorkflow.jsp
index 751cff0be..a6bf6b518 100644
--- a/webapp/web/jenaIngest/executeWorkflow.jsp
+++ b/webapp/web/jenaIngest/executeWorkflow.jsp
@@ -42,4 +42,4 @@
         %>
         </select>
   
-    <input id="submit" type="submit" value="Next &gt;"/>
+    <input class="submit" type="submit" value="Next &gt;"/>
diff --git a/webapp/web/jenaIngest/exportSelection.jsp b/webapp/web/jenaIngest/exportSelection.jsp
index 27eb39a2c..7df0d84e4 100644
--- a/webapp/web/jenaIngest/exportSelection.jsp
+++ b/webapp/web/jenaIngest/exportSelection.jsp
@@ -44,7 +44,7 @@
     <option value="TURTLE">Turtle</option>
 </select>
 
-<input id="submit" type="submit" name="submit" value="Export"/>
+<input class="submit" type="submit" name="submit" value="Export"/>
 
 </form>
 
diff --git a/webapp/web/jenaIngest/generateTBox.jsp b/webapp/web/jenaIngest/generateTBox.jsp
index f9813d81e..9cbeb1816 100644
--- a/webapp/web/jenaIngest/generateTBox.jsp
+++ b/webapp/web/jenaIngest/generateTBox.jsp
@@ -51,4 +51,4 @@
 %>   
     </select>
 
-    <input id="submit" type="submit" value="Generate TBox"/>
+    <input class="submit" type="submit" value="Generate TBox"/>
diff --git a/webapp/web/jenaIngest/loadRDFData.jsp b/webapp/web/jenaIngest/loadRDFData.jsp
index 67b918886..a8e325f57 100644
--- a/webapp/web/jenaIngest/loadRDFData.jsp
+++ b/webapp/web/jenaIngest/loadRDFData.jsp
@@ -18,5 +18,5 @@
 </select>
 <br></br>
 <br></br>
-<p><input id="submit" type="submit" name="submit" value="Load Data" /></p>
+<p><input class="submit" type="submit" name="submit" value="Load Data" /></p>
 </form>
\ No newline at end of file
diff --git a/webapp/web/jenaIngest/mergeIndividuals.jsp b/webapp/web/jenaIngest/mergeIndividuals.jsp
index 5a2a296e0..c2d44f662 100644
--- a/webapp/web/jenaIngest/mergeIndividuals.jsp
+++ b/webapp/web/jenaIngest/mergeIndividuals.jsp
@@ -37,6 +37,6 @@
     <td>Duplicate individual URI</td><td><input id="uri2" type="text" size="52" name="uri2"/></td>
 </tr>
 </table>
-<input id="submit"type="submit" name="submit" value="Merge individuals" /></p>
+<input class="submit"type="submit" name="submit" value="Merge individuals" /></p>
 </form>
 
diff --git a/webapp/web/jenaIngest/merge_result.jsp b/webapp/web/jenaIngest/merge_result.jsp
index f09ec326b..306b77769 100644
--- a/webapp/web/jenaIngest/merge_result.jsp
+++ b/webapp/web/jenaIngest/merge_result.jsp
@@ -18,7 +18,7 @@ if(!result.equals("No statements merged") && !result.endsWith("statements.")){%>
 <TR>
                 <br>
                  <p>Download non-mergeable statements.</p>
-                 <p><input id="submit"  type="submit" name="Download" value="Download" ></input></p>
+                 <p><input class="submit"  type="submit" name="Download" value="Download" ></input></p>
                 <br>
   </TR>
 <%}} %>
diff --git a/webapp/web/jenaIngest/permanentURI.jsp b/webapp/web/jenaIngest/permanentURI.jsp
index 969085611..5b09a324f 100644
--- a/webapp/web/jenaIngest/permanentURI.jsp
+++ b/webapp/web/jenaIngest/permanentURI.jsp
@@ -56,5 +56,5 @@ Or <%String defaultNamespace = (String)request.getAttribute("defaultNamespace");
 <p>Use default namespace <%=defaultNamespace%>  <input type="checkbox" name="defaultNamespace" value ="<%=defaultNamespace%>"/>
 </p>
 
-<p><input id="submit" type="submit" name="submit" value="Generate URIs" /></p>
+<p><input class="submit" type="submit" name="submit" value="Generate URIs" /></p>
 </form>
\ No newline at end of file
diff --git a/webapp/web/jenaIngest/processStrings.jsp b/webapp/web/jenaIngest/processStrings.jsp
index b13816676..cef9f632d 100644
--- a/webapp/web/jenaIngest/processStrings.jsp
+++ b/webapp/web/jenaIngest/processStrings.jsp
@@ -69,4 +69,4 @@
 	</select>
     <p>model in which to save retracted statements</p>
 
-    <input id="submit" type="submit" value="Process property values"/>
+    <input class="submit" type="submit" value="Process property values"/>
diff --git a/webapp/web/jenaIngest/renameBNodes.jsp b/webapp/web/jenaIngest/renameBNodes.jsp
index af534773a..02f170e70 100644
--- a/webapp/web/jenaIngest/renameBNodes.jsp
+++ b/webapp/web/jenaIngest/renameBNodes.jsp
@@ -35,5 +35,5 @@
 %>
     </ul>
 
-    <input id="submit" type="submit" value="Next Step"/>
+    <input class="submit" type="submit" value="Next Step"/>
     </form>
diff --git a/webapp/web/jenaIngest/renameBNodesURISelect.jsp b/webapp/web/jenaIngest/renameBNodesURISelect.jsp
index 791ff943f..4f4ed79e7 100644
--- a/webapp/web/jenaIngest/renameBNodesURISelect.jsp
+++ b/webapp/web/jenaIngest/renameBNodesURISelect.jsp
@@ -88,7 +88,7 @@ function disableProperties(){
 %>   
     </select>
 
-    <input id="submit" type="submit" value="Rename Blank Nodes"/>
+    <input class="submit" type="submit" value="Rename Blank Nodes"/>
     
     </form>
     
diff --git a/webapp/web/templates/parts/emailUsers.jsp b/webapp/web/templates/parts/emailUsers.jsp
index 75e437792..f86380338 100644
--- a/webapp/web/templates/parts/emailUsers.jsp
+++ b/webapp/web/templates/parts/emailUsers.jsp
@@ -31,7 +31,7 @@
 		<textarea name="s34gfd88p9x1" rows="10" cols="90"></textarea>
 		<div>
   		<input type="submit" id="submit" value="Send Mail" />
-  		<input type="reset" id="delete" value="Clear Form" />
+  		<input type="reset" class="delete" value="Clear Form" />
 		</div
 
 		<p style="font-weight: bold; margin-top: 1em">Thank you!</p>