diff --git a/OurUmbraco.Site/Views/MacroPartials/Forum/Forum.cshtml b/OurUmbraco.Site/Views/MacroPartials/Forum/Forum.cshtml
index 63707d50..c4217dbf 100644
--- a/OurUmbraco.Site/Views/MacroPartials/Forum/Forum.cshtml
+++ b/OurUmbraco.Site/Views/MacroPartials/Forum/Forum.cshtml
@@ -104,15 +104,20 @@
     <div id="search-options" class="search-options">
         <label>Filter by</label>
         <div class="options">
-            <span>
+
+            <label class="checkbox">
                 <input type="checkbox" name="unsolved" />
+                <span></span>
                 <small>show only unsolved topics</small>
-            </span>
-            <br />
-            <span>
+            </label>
+
+
+            <label class="checkbox">
                 <input type="checkbox" name="noreplies" />
+                <span></span>
                 <small>show only topics with no replies</small>
-            </span>
+            </label>
+
         </div>
     </div>
 </div>
diff --git a/OurUmbraco.Site/Views/Search/Search.aspx b/OurUmbraco.Site/Views/Search/Search.aspx
index 35d5e116..2f8fea1e 100644
--- a/OurUmbraco.Site/Views/Search/Search.aspx
+++ b/OurUmbraco.Site/Views/Search/Search.aspx
@@ -43,21 +43,31 @@
 
                 <% if(Request.QueryString["cat"] == "forum")
                     { %>
-                    <div id="search-options" class="search-options">
-                        <label>Sort by</label>
-                    <div class="options">
-                        <span>
-                            <input type="checkbox" name="solved"/>
-                            <small>show only solved topics</small
-                        ></span><br/>
-                        <span>
-                            <input type="checkbox" name="replies"/><small>show only topics with replies</small>
-                        </span><br/>
-                        <span>
-                            <input type="checkbox" name="order" value="updateDate"/><small>show last updated first</small>
-                        </span>
-                    </div>
-                    </div>
+                        <div id="search-options" class="search-options">
+                            <label>Sort by</label>
+                            <div class="options">
+
+                                <label class="checkbox">
+                                    <input type="checkbox" name="solved"/>
+                                    <span></span>
+                                    <small>show only solved topics</small>
+                                </label>
+
+                                <label class="checkbox">
+                                    <input type="checkbox" name="replies"/>
+                                    <span></span>
+                                    <small>show only topics with replies</small>
+                                </label>
+
+                                <label class="checkbox">
+                                    <input type="checkbox" name="order" value="updateDate"/>
+                                    <span></span>
+                                    <small>show last updated first</small>
+                                </label>
+
+                            </div>
+                        </div>
+
                 <% } %>
 
 <%--                <% if (Request.QueryString["cat"] == "project")