diff --git a/syllabus/syllabus-app/src/java/org/sakaiproject/jsf/syllabus/SyllabusTableComponent.java b/syllabus/syllabus-app/src/java/org/sakaiproject/jsf/syllabus/SyllabusTableComponent.java
index 660ec010a966..e94a6714f9e8 100644
--- a/syllabus/syllabus-app/src/java/org/sakaiproject/jsf/syllabus/SyllabusTableComponent.java
+++ b/syllabus/syllabus-app/src/java/org/sakaiproject/jsf/syllabus/SyllabusTableComponent.java
@@ -28,7 +28,7 @@ public SyllabusTableComponent()
 	{
 		super();
 
-		setStyleClass("listHier lines");
+		setStyleClass("table table-striped table-bordered");
 		setCellpadding("0");
 		setCellspacing("0");
 		setSummary("When used in main edit list - message is: First column holds the syllabus item, second and third column hold links to move the item up or down the list, fourth column indicates if the item has been posted, last column has a checkbox, select to remove. When table is being used to display attachments message needs to be: First column holds the attachment name and a link to remove it from the list. Second column holds the size, third, the type, fourth the author, last column the person to edit the attachment last. Both messages need to come from the bundle.");
diff --git a/syllabus/syllabus-app/src/webapp/syllabus/main_edit.jsp b/syllabus/syllabus-app/src/webapp/syllabus/main_edit.jsp
index 19c0fcf8a7d8..ce3683dddfb4 100644
--- a/syllabus/syllabus-app/src/webapp/syllabus/main_edit.jsp
+++ b/syllabus/syllabus-app/src/webapp/syllabus/main_edit.jsp
@@ -211,7 +211,7 @@
    	      <h:messages globalOnly="true" layout="table" styleClass="sak-banner-error" rendered="#{!empty facesContext.maximumSeverity}" />
 	      <syllabus:syllabus_if test="#{SyllabusTool.syllabusItem.redirectURL}">
 		     <sakai:tool_bar_message value="#{msgs.mainEditNotice}" />
-		     <h:dataTable id="dataTable" value="#{SyllabusTool.entries}" var="eachEntry" summary="#{msgs.mainEditListSummary}" styleClass="listHier lines nolines"
+		     <h:dataTable id="dataTable" value="#{SyllabusTool.entries}" var="eachEntry" summary="#{msgs.mainEditListSummary}" styleClass="table table-striped table-bordered"
 		     				columnClasses="item,move,move,status,status" >
 						<h:column rendered="#{! SyllabusTool.displayNoEntryMsg}">
 							<f:facet name="header">
@@ -253,10 +253,8 @@
 							<f:facet name="header">
 								<h:panelGroup>
 									<h:outputText value="#{msgs.mainEditHeaderInCalendar}"/>
-									<f:verbatim>
 										<br/>
-										<input type="checkbox" onchange="toggleAllCalendarOptions(this);"/>
-									</f:verbatim>
+										<h:selectBooleanCheckbox title="#{msgs.mainEditHeaderInCalendar}" onchange="toggleAllCalendarOptions(this);"/>
 								</h:panelGroup>
 							</f:facet>
 							<h:selectBooleanCheckbox styleClass="calendarBox" value="#{eachEntry.entry.linkCalendar}" title="#{msgs.selectThisCheckBoxCal}" onchange="checkStartEndDates(this)"/>
@@ -265,10 +263,8 @@
 							<f:facet name="header">
 								<h:panelGroup>
 									<h:outputText value="#{msgs.mainEditHeaderStatus}"/>
-									<f:verbatim>
 										<br/>
-										<input type="checkbox" onchange="toggleAllPostOptions(this);"/>
-									</f:verbatim>
+										<h:selectBooleanCheckbox title="#{msgs.mainEditHeaderStatus}" onchange="toggleAllPostOptions(this);"/>
 								</h:panelGroup>
 							</f:facet>
 							<h:selectBooleanCheckbox styleClass="postBox" value="#{eachEntry.posted}" title="#{msgs.selectThisCheckBoxPublish}" onchange="toggleCalendarCheckbox(this);" />
@@ -277,10 +273,8 @@
 							<f:facet name="header">
 								<h:panelGroup>
   									<h:outputText value="#{msgs.mainEditHeaderRemove}"/>
-  									<f:verbatim>
 										<br/>
-										<input type="checkbox" onchange="$('.deleteBox').attr('checked', this.checked);"/>
-									</f:verbatim>
+										<h:selectBooleanCheckbox title="#{msgs.mainEditHeaderRemove}" onchange="$('.deleteBox').attr('checked', this.checked);"/>
 								</h:panelGroup>
 							</f:facet>
 							<h:selectBooleanCheckbox styleClass="deleteBox" value="#{eachEntry.selected}" title="#{msgs.selectThisCheckBox}"/>