diff --git a/nano/templates/identification_computer.tmpl b/nano/templates/identification_computer.tmpl
index 77c3c1cc720..b12f3ab444e 100644
--- a/nano/templates/identification_computer.tmpl
+++ b/nano/templates/identification_computer.tmpl
@@ -162,7 +162,6 @@
                   {{/for}}
                 </td>
               </tr>
-              <tr>
               <tr>
                 <th style="color: '#C060C0';">Science</th>
                 <td>
@@ -179,12 +178,10 @@
                   {{/for}}
                 </td>
               </tr>
+              <tr>
                 <th style="color: '#808080';">Civilian</th>
                 <td>
                   {{for data.civilian_jobs}}
-                    {{if index && index % 6 === 0}}
-                      </td></tr><tr><th></th><td>
-                    {{/if}}
                     {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}}
                   {{/for}}
                 </td>
@@ -194,10 +191,6 @@
                   <th style="color: '#A52A2A';">CentCom</th>
                   <td>
                     {{for data.centcom_jobs}}
-                      {{if index % 6 === 0}}
-                        </td></tr><tr><th></th><td>
-                      {{/if}}
-
                       {{:helper.link(value.display_name, '', {'choice' : 'assign', 'assign_target' : value.job}, data.target_rank == value.job ? 'disabled' : null)}}
                     {{/for}}
                   </td>
@@ -214,7 +207,7 @@
           <div class='item' style='width: 100%'>
             {{for data.all_centcom_access}}
               <div class='itemContentWide'>
-              {{:helper.link(value.desc, '', {'choice' : 'access', 'access_target' : value.ref, 'allowed' : allowed}, null, value.allowed ? 'selected' : null)}}
+              {{:helper.link(value.desc, '', {'choice' : 'access', 'access_target' : value.ref, 'allowed' : value.allowed}, null, value.allowed ? 'selected' : null)}}
               </div>
             {{/for}}
           </div>