Index: webapp/components/uiOptions/html/UIOptions.html
===================================================================
--- webapp/components/uiOptions/html/UIOptions.html	(revision 7155)
+++ webapp/components/uiOptions/html/UIOptions.html	(working copy)
@@ -124,19 +124,23 @@
                                 </span>
                             </li>
                             <li>
-                                <label class="fl-label">Links:</label>
+                            	<fieldset>	
+                                <label class="fl-label"><legend>Links:</legend></label><!-- FLUID-2399 --> 
                                 <input rsf:id="links-underline" id="links-underline" class="flc-uiOptions-control" type="checkbox"/>
                                 <label for="links-underline">Underline</label>
                                 <input rsf:id="links-bold" id="links-bold" class="flc-uiOptions-control" type="checkbox"/>
                                 <label for="links-bold">Bold</label>
                                 <input rsf:id="links-larger" id="links-larger" class="flc-uiOptions-control" type="checkbox"/>
                                 <label for="links-larger">Larger</label>
+								</fieldset>
                             </li>
                             <li>
-                                <label class="fl-label">Inputs:</label>
+                            	<fieldset>
+                                <label class="fl-label"><legend>Inputs:</legend></label><!-- FLUID-2399 --> 
                                 <input rsf:id="inputs-larger" id="inputs-larger" class="flc-uiOptions-control" type="checkbox"/>
                                 <label for="inputs-larger">Larger</label>
-                            </li>
+                            	</fieldset>
+							</li>
                         </ol>
                     </div>
                 </fieldset>