diff --git a/oef/templates/oef/output.html b/oef/templates/oef/output.html
index b074ea14..33799c52 100644
--- a/oef/templates/oef/output.html
+++ b/oef/templates/oef/output.html
@@ -4,54 +4,63 @@
 
 
 {% block content %}
-<table>
-    <tr>
-        <th>Format name</th>
-        <th>Action</th>
-        <th>Field Seq</th>
-        <th>Field Label</th>
-        <th>Field Name</th>
-        <th>Field Status</th>
-        <th>Field Type</th>
-        <th>Field Codeset</th>
-    </tr>
-{% for output in outputs %}
+    <table>
+        <tr>
+            <th>Format name</th>
+            <th>Action</th>
+            <th>Field Seq</th>
+            <th>Field Label</th>
+            <th>Field Name</th>
+            <th>Field Status</th>
+            <th>Field Type</th>
+            <th>Field Codeset</th>
+        </tr>
+        {% for output in outputs %}
 
-<tr>
-    <td>Radiology {{output.name}}</td>
-    <td>Order</td>
-    <td>{{output.field_seq}}</td>
+            <tr>
+                <td>Radiology {{output.name}}</td>
+                <td>Order</td>
+                <td>{{output.field_seq}}</td>
 
-    <td>{{output.field_label}}</td>
-    <td>{{output.field_name}}</td>
-    <td>{{output.field_status}}</td>
-    <td>{{output.field_type}}</td>
-    <td>RADCODESET{{output.field_codeset}}</td>
+                <td>{{output.field_label}}</td>
+                <td>{{output.field_name}}</td>
+                <td>{{output.field_status}}</td>
+                <td>{{output.field_type}}</td>
+                <td>
+                    {% if output.field_codeset %}
+                        RADCODESET{{output.field_codeset}}
+                    {% endif %}
+                </td>
 
-</tr>
-    
-{% endfor %}
-</table>
+            </tr>
 
-<h3>Codesets</h3>
-
-<table>
-    
-    <tr><th>Codeset</th><th>Option</th></tr>
-    {% for codeset, options in codesets %}
-
-        
-        {% for option in options %}
-        <tr><td>RADCODESET{{codeset}}</td><td>{{option}}</td></tr>
-            
         {% endfor %}
-            
-        
-    {% endfor %}
+    </table>
+
+    <h3>Codesets</h3>
+
+    <table>
+
+        <tr><th>Codeset</th><th>Option</th></tr>
+        {% for codeset, options in codesets %}
+
+
+            {% for option in options %}
+                <tr>
+                    <td>
+                        {% if codeset %}
+                            RADCODESET{{codeset}}
+                        {% endif %}
+                    </td>
+                    <td>{{option}}</td></tr>
+
+            {% endfor %}
+
+
+        {% endfor %}
+
+    </table>
+
+
 
-</table>
-        
-    
-    
 {% endblock content %}
-    
\ No newline at end of file