diff --git a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
index a70511f..138d6a1 100644
--- a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
@@ -141,6 +141,9 @@ public int compare(FacilityControlVerification o1, FacilityControlVerification o
               }
             });
 
+        Collections.sort(cc.getBeamControlVerificationList());
+        Collections.sort(cc.getRFControlVerificationList());
+
         if (facility != null) {
           for (FacilityControlVerification facilityControlVerification :
               new ArrayList<>(cc.getFacilityControlVerificationList())) {
diff --git a/src/main/webapp/WEB-INF/views/control-verification.jsp b/src/main/webapp/WEB-INF/views/control-verification.jsp
index a7f2c9d..5b61654 100644
--- a/src/main/webapp/WEB-INF/views/control-verification.jsp
+++ b/src/main/webapp/WEB-INF/views/control-verification.jsp
@@ -89,31 +89,6 @@
             <c:choose>
                 <c:when test="${creditedControl ne null}">
                     <div>
-                        <h3>Facility Verifications</h3>
-                        <ul id="facility-control-verification-list">
-                            <c:forEach items="${creditedControl.facilityControlVerificationList}" var="fv">
-                                <li>
-                                    <c:choose>
-                                        <c:when test="${fv.verificationStatusId eq 1}">
-                                            <span title="Verified" class="small-icon baseline-small-icon verified-icon"></span>
-                                        </c:when>
-                                        <c:when test="${fv.verificationStatusId eq 50}">
-                                            <span title="Verified" class="small-icon baseline-small-icon provisional-icon"></span>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <span title="Not Verified" class="small-icon baseline-small-icon not-verified-icon"></span>
-                                        </c:otherwise>
-                                    </c:choose>
-                                    <c:out value="${fv.getFacilityControlVerificationPK().facility.name}"/>
-                                    <c:if test="${fv.verificationStatusId ne 100}">
-                                        <span class="title-expiration" title="Earliest Control Expiration">
-                                            {Expires: <fmt:formatDate value="${fv.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>}
-                                        </span>
-                                        <span class="expiring-soon" style="<c:out value="${jam:isExpiringSoon(fv.expirationDate) ? 'display: inline-block;' : 'display: none;'}"/>">(Expiring Soon)</span>
-                                    </c:if>
-                                </li>
-                            </c:forEach>
-                        </ul>
                         <h3>Operations Verifications</h3>
                         <div class="accordion">
                             <h3>RF Operations</h3>
diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp
index d16ef30..6e32311 100644
--- a/src/main/webapp/WEB-INF/views/verifications.jsp
+++ b/src/main/webapp/WEB-INF/views/verifications.jsp
@@ -68,7 +68,7 @@
                         <table id="credited-control-verifications-table" class="data-table">
                             <thead>
                                 <tr>
-                                    <th colspan="3">Facility Control Status with Expiration</th>
+                                    <th colspan="2">Facility Control Status</th>
                                 </tr>
                             </thead>
                             <tbody>
@@ -78,44 +78,65 @@
                                     <td>
                                         <ul>
                                             <c:forEach items="${cc.facilityControlVerificationList}" var="fv">
-                                                <li>
-                                                    <c:choose>
-                                                        <c:when test="${fv.verificationStatusId eq 1}">
-                                                            <span title="Verified"
-                                                                  class="small-icon baseline-small-icon verified-icon"></span>
-                                                        </c:when>
-                                                        <c:when test="${fv.verificationStatusId eq 50}">
-                                                            <span title="Verified"
-                                                                  class="small-icon baseline-small-icon provisional-icon"></span>
-                                                        </c:when>
-                                                        <c:otherwise>
-                                                            <span title="Not Verified"
-                                                                  class="small-icon baseline-small-icon not-verified-icon"></span>
-                                                        </c:otherwise>
-                                                    </c:choose>
-                                                    <c:out value="${fv.getFacilityControlVerificationPK().facility.name}"/>
-                                                    <c:if test="${fv.verificationStatusId ne 100}">
-                                                        <span title="Earliest Control Expiration">
-                                                            <fmt:formatDate value="${fv.expirationDate}"
-                                                                            pattern="${s:getFriendlyDateTimePattern()}"/>
-                                                        </span>
-                                                        <span class="expiring-soon"
-                                                              style="<c:out value="${jam:isExpiringSoon(fv.expirationDate) ? 'display: inline-block;' : 'display: none;'}"/>">(Expiring Soon)</span>
-                                                    </c:if>
-                                                </li>
+                                                <div class="collapsed-accordion">
+                                                    <h3><c:out value="${fv.getFacilityControlVerificationPK().facility.name}"/></h3>
+                                                    <div class="content">
+                                                        <table class="data-table facility-verification-table">
+                                                            <thead>
+                                                            <tr>
+                                                                <th>RF Segments</th>
+                                                                <th>Beam Destinations</th>
+                                                                <th></th>
+                                                            </tr>
+                                                            </thead>
+                                                            <tbody>
+                                                            <tr>
+                                                                <td>
+                                                                    <c:choose>
+                                                                        <c:when test="${fn:length(cc.getRFControlVerificationList()) < 1}">
+                                                                            None
+                                                                        </c:when>
+                                                                        <c:otherwise>
+                                                                            <ul>
+                                                                                <c:forEach items="${cc.getRFControlVerificationList()}" var="verification">
+                                                                                    <li><div title="${verification.verificationStatusId eq 1 ? 'Verified' : (verification.verificationStatusId eq 50 ? 'Provisionally Verified' : 'Not Verified')}" class="small-icon baseline-small-icon ${verification.verificationStatusId eq 1 ? 'verified-icon' : (verification.verificationStatusId eq 50 ? 'provisional-icon' : 'not-verified-icon')}"></div> <span class="truncated-operations-label"><c:out value="${verification.RFSegment.name}"/></span></li>
+                                                                                </c:forEach>
+                                                                            </ul>
+                                                                        </c:otherwise>
+                                                                    </c:choose>
+                                                                </td>
+                                                                <td>
+                                                                    <c:choose>
+                                                                        <c:when test="${fn:length(cc.getBeamControlVerificationList()) < 1}">
+                                                                            None
+                                                                        </c:when>
+                                                                        <c:otherwise>
+                                                                            <ul>
+                                                                                <c:forEach items="${cc.getBeamControlVerificationList()}" var="verification">
+                                                                                    <li><div title="${verification.verificationStatusId eq 1 ? 'Verified' : (verification.verificationStatusId eq 50 ? 'Provisionally Verified' : 'Not Verified')}" class="small-icon baseline-small-icon ${verification.verificationStatusId eq 1 ? 'verified-icon' : (verification.verificationStatusId eq 50 ? 'provisional-icon' : 'not-verified-icon')}"></div> <span class="truncated-operations-label"><c:out value="${verification.beamDestination.name}"/></span></li>
+                                                                                </c:forEach>
+                                                                            </ul>
+                                                                        </c:otherwise>
+                                                                    </c:choose>
+                                                                </td>
+                                                                <td>
+                                                                    <form method="get"
+                                                                          action="${pageContext.request.contextPath}/verifications/control">
+                                                                        <input type="hidden" name="creditedControlId"
+                                                                               value="${cc.creditedControlId}"/>
+                                                                        <input type="hidden" name="facilityId"
+                                                                               value="${fn:escapeXml(fv.getFacilityControlVerificationPK().facility.facilityId)}"/>
+                                                                        <button class="single-char-button" type="submit">&rarr;</button>
+                                                                    </form>
+                                                                </td>
+                                                            </tr>
+                                                            </tbody>
+                                                        </table>
+                                                    </div>
+                                                </div>
                                             </c:forEach>
                                         </ul>
                                     </td>
-                                    <td>
-                                        <form method="get"
-                                              action="${pageContext.request.contextPath}/verifications/control">
-                                            <input type="hidden" name="creditedControlId"
-                                                   value="${cc.creditedControlId}"/>
-                                            <input type="hidden" name="facilityId"
-                                                   value="${fn:escapeXml(param.facilityId)}"/>
-                                            <button class="single-char-button" type="submit">&rarr;</button>
-                                        </form>
-                                    </td>
                                 </tr>
                             </c:forEach>
                             </tbody>
diff --git a/src/main/webapp/resources/css/jam.css b/src/main/webapp/resources/css/jam.css
index addf632..97dbe78 100644
--- a/src/main/webapp/resources/css/jam.css
+++ b/src/main/webapp/resources/css/jam.css
@@ -91,4 +91,24 @@ ul.jam-cell-list li {
 }
 .page-dialog .dialog-only-inline-block {
     display: inline-block;
+}
+.facility-verification-table ul {
+    margin: 0;
+    padding: 0;
+}
+.facility-verification-table ul li {
+    list-style: none;
+}
+.collapsed-accordion {
+    display: none;
+}
+.collapsed-accordion .content {
+    padding: 5px;
+}
+.truncated-operations-label {
+    display: inline-block;
+    width: 175px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/verifications.js b/src/main/webapp/resources/js/verifications.js
index 166fc0c..f87d53a 100644
--- a/src/main/webapp/resources/js/verifications.js
+++ b/src/main/webapp/resources/js/verifications.js
@@ -13,6 +13,11 @@ $( ".accordion" ).accordion({
     heightStyle: "content",
     active: 0
 });
+$( ".collapsed-accordion" ).accordion({
+    collapsible: true,
+    heightStyle: "content",
+    active: false
+}).show();
 $(function() {
    $("#expiring-dialog").dialog({
        width: 900,