diff --git a/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/AlarmNcsFilterCallback.java b/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/AlarmNcsFilterCallback.java
new file mode 100644
index 0000000..a33c784
--- /dev/null
+++ b/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/AlarmNcsFilterCallback.java
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * This file is part of OpenNMS(R).
+ * <p/>
+ * Copyright (C) 2015 The OpenNMS Group, Inc.
+ * OpenNMS(R) is Copyright (C) 1999-2015 The OpenNMS Group, Inc.
+ * <p/>
+ * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc.
+ * <p/>
+ * OpenNMS(R) is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
+ * <p/>
+ * OpenNMS(R) is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ * <p/>
+ * You should have received a copy of the GNU Affero General Public License
+ * along with OpenNMS(R).  If not, see:
+ * http://www.gnu.org/licenses/
+ * <p/>
+ * For more information contact:
+ * OpenNMS(R) Licensing <license@opennms.org>
+ * http://www.opennms.org/
+ * http://www.opennms.com/
+ *******************************************************************************/
+
+package org.opennms.web.controller.ncs;
+
+import java.util.List;
+
+import javax.servlet.ServletContext;
+
+import org.opennms.web.filter.Filter;
+import org.opennms.web.tags.filters.AbstractFilterCallback;
+
+public class AlarmNcsFilterCallback extends AbstractFilterCallback {
+    public AlarmNcsFilterCallback(ServletContext servletContext) {
+        super(servletContext);
+    }
+
+    @Override
+    protected String getIndividualFilterString(Filter filter) {
+        return null;
+    }
+
+    @Override
+    protected List<Filter> getIndividualFilterList(String[] filters, ServletContext servletContext) {
+        return null;
+    }
+}
diff --git a/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/NCSAlarmController.java b/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/NCSAlarmController.java
index 965885d..6efc4d8 100644
--- a/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/NCSAlarmController.java
+++ b/features/ncs/ncs-alarm-gui/src/main/java/org/opennms/web/controller/ncs/NCSAlarmController.java
@@ -155,6 +155,7 @@ public class NCSAlarmController {
         modelAndView.addObject("alarms", alarms);
         modelAndView.addObject("alarmCount", alarmCount);
         modelAndView.addObject("parms", parms);
+        modelAndView.addObject("callback", new AlarmNcsFilterCallback(getServletContext()));
         return modelAndView;
     }
 
diff --git a/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp b/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp
index b382a97..eaeb996 100644
--- a/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp
+++ b/features/ncs/ncs-alarm-gui/src/main/webapp/WEB-INF/jsp/alarm/ncs-alarms.jsp
@@ -36,41 +36,44 @@
 <%@page import="java.util.ArrayList" %>
 <%@page import="java.util.List" %>
 
-<%@page import="org.opennms.web.api.Util"%>
-<%@page import="org.opennms.core.utils.InetAddressUtils" %>
+<%@page import="org.opennms.core.utils.InetAddressUtils"%>
 <%@page import="org.opennms.core.utils.WebSecurityUtils" %>
-<%@page import="org.opennms.web.servlet.XssRequestWrapper" %>
-<%@page import="org.opennms.web.api.Authentication" %>
+<%@page import="org.opennms.netmgt.model.OnmsAlarm" %>
+<%@page import="org.opennms.web.alarm.AcknowledgeType" %>
+<%@page import="org.opennms.web.alarm.AlarmQueryParms" %>
 
-<%@page import="org.opennms.web.controller.alarm.AcknowledgeAlarmController" %>
-<%@page import="org.opennms.web.controller.alarm.AlarmSeverityChangeController" %>
+<%@page import="org.opennms.web.alarm.AlarmUtil" %>
+<%@page import="org.opennms.web.alarm.SortStyle" %>
 
-<%@page import="org.opennms.netmgt.model.OnmsAlarm"%>
+<%@page import="org.opennms.web.alarm.filter.AfterFirstEventTimeFilter"%>
 
-<%@page import="org.opennms.web.filter.Filter" %>
-<%@page import="org.opennms.web.alarm.AlarmQueryParms" %>
-<%@page import="org.opennms.web.alarm.SortStyle" %>
-<%@page import="org.opennms.web.alarm.AcknowledgeType" %>
-<%@page import="org.opennms.web.alarm.AlarmUtil" %>
+<%@page import="org.opennms.web.alarm.filter.AfterLastEventTimeFilter" %>
+<%@page import="org.opennms.web.alarm.filter.BeforeFirstEventTimeFilter" %>
+<%@page import="org.opennms.web.alarm.filter.BeforeLastEventTimeFilter" %>
+<%@page import="org.opennms.web.alarm.filter.EventParmLikeFilter" %>
 <%@page import="org.opennms.web.alarm.filter.ExactUEIFilter" %>
+<%@page import="org.opennms.web.alarm.filter.InterfaceFilter" %>
+<%@page import="org.opennms.web.alarm.filter.NegativeEventParmLikeFilter" %>
 <%@page import="org.opennms.web.alarm.filter.NegativeExactUEIFilter" %>
-<%@page import="org.opennms.web.alarm.filter.SeverityFilter" %>
+<%@page import="org.opennms.web.alarm.filter.NegativeInterfaceFilter" %>
+<%@page import="org.opennms.web.alarm.filter.NegativeNodeFilter" %>
+<%@page import="org.opennms.web.alarm.filter.NegativeServiceFilter" %>
 <%@page import="org.opennms.web.alarm.filter.NegativeSeverityFilter" %>
 <%@page import="org.opennms.web.alarm.filter.NodeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.NegativeNodeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.InterfaceFilter" %>
-<%@page import="org.opennms.web.alarm.filter.NegativeInterfaceFilter" %>
 <%@page import="org.opennms.web.alarm.filter.ServiceFilter" %>
-<%@page import="org.opennms.web.alarm.filter.NegativeServiceFilter" %>
-<%@page import="org.opennms.web.alarm.filter.AfterLastEventTimeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.BeforeLastEventTimeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.AfterFirstEventTimeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.BeforeFirstEventTimeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.EventParmLikeFilter" %>
-<%@page import="org.opennms.web.alarm.filter.NegativeEventParmLikeFilter" %>
+<%@page import="org.opennms.web.alarm.filter.SeverityFilter" %>
+<%@page import="org.opennms.web.api.Authentication" %>
+<%@page import="org.opennms.web.api.Util" %>
+<%@page import="org.opennms.web.controller.alarm.AlarmSeverityChangeController" %>
+<%@page import="org.opennms.web.controller.ncs.AlarmNcsFilterCallback" %>
+<%@page import="org.opennms.web.filter.Filter" %>
+<%@page import="org.opennms.web.servlet.XssRequestWrapper" %>
+<%@ page import="org.opennms.web.tags.filters.FilterCallback" %>
 
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+<%@taglib uri="../../taglib.tld" prefix="onms" %>
+
 
 <%--
   This page is written to be the display (view) portion of the AlarmQueryServlet
@@ -91,6 +94,7 @@
     OnmsAlarm[] alarms = (OnmsAlarm[])req.getAttribute( "alarms" );
     int alarmCount = req.getAttribute("alarmCount") == null ? -1 : (Integer)req.getAttribute("alarmCount");
     AlarmQueryParms parms = (AlarmQueryParms)req.getAttribute( "parms" );
+    FilterCallback callback = (AlarmNcsFilterCallback) req.getAttribute("callback");
 
     if( alarms == null || parms == null ) {
         throw new ServletException( "Missing either the alarms or parms request attribute." );
@@ -112,7 +116,7 @@
 
 
 
-<jsp:include page="/includes/header.jsp" flush="false" >
+<jsp:include page="/includes/bootstrap.jsp" flush="false" >
   <jsp:param name="title" value="Alarm List" />
   <jsp:param name="headTitle" value="List" />
   <jsp:param name="headTitle" value="Alarms" />
@@ -210,25 +214,31 @@
 
   </script>
 
+<div id="severityLegendModal" class="modal fade" tabindex="-1">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <jsp:include page="/alarm/severity.jsp" flush="false" />
+        </div>
+    </div>
+</div>
 
       <!-- menu -->
-      <div id="linkbar">
-      <ul>
-      <li><a href="<%=this.makeLink( parms, new ArrayList<Filter>())%>" title="Remove all search constraints" >View all alarms</a></li>
-      <li><a href="alarm/advsearch.jsp" title="More advanced searching and sorting options">Advanced Search</a></li>
+      <div class="row">
+      <div class="col-md-12">
+      <a class="btn btn-default" href="<%=this.makeLink( parms, new ArrayList<Filter>())%>" title="Remove all search constraints" >View all alarms</>
+      <a class="btn btn-default" href="alarm/advsearch.jsp" title="More advanced searching and sorting options">Advanced Search</a>
       <c:choose>
         <c:when test="${param.display == 'long'}">
-      <li><a href="<%=this.makeLink(parms, "short")%>" title="Summary List of Alarms">Short Listing</a></li>
+      <a class="btn btn-default" href="<%=this.makeLink(parms, "short")%>" title="Summary List of Alarms">Short Listing</a>
         </c:when>
         <c:otherwise>
-      <li><a href="<%=this.makeLink(parms, "long")%>" title="Detailed List of Alarms">Long Listing</a></li>
+      <a class="btn btn-default" href="<%=this.makeLink(parms, "long")%>" title="Detailed List of Alarms">Long Listing</a>
         </c:otherwise>
       </c:choose>
-      <li><a onclick="javascript:window.open('<%=Util.calculateUrlBase(req, "alarm/severity.jsp")%>','', 'fullscreen=no,toolbar=no,status=no,menubar=no,scrollbars=no,resizable=yes,directories=no,location=no,width=525,height=330')" title="Open a window explaining the alarm severities">Severity Legend</a></li>
+      <a class="btn btn-default" onclick="$('#severityLegendModal').modal()">Severity Legend</a>
       
       <% if( req.isUserInRole( Authentication.ROLE_ADMIN ) || !req.isUserInRole( Authentication.ROLE_READONLY ) ) { %>
         <% if ( alarmCount > 0 ) { %>
-          <li>
             <!-- hidden form for acknowledging the result set -->
             <form style="display:inline" method="post" action="<%= Util.calculateUrlBase(req, "alarm/acknowledgeByFilter") %>" name="acknowledge_by_filter_form">
               <input type="hidden" name="redirectParms" value="<c:out value="<%=req.getQueryString()%>"/>" />
@@ -240,16 +250,21 @@
             <% } else { %>
               <a href="javascript:void()" onclick="if (confirm('Are you sure you want to unacknowledge all alarms in the current search including those not shown on your screen)?  (<%=alarmCount%> total alarms)')) { document.acknowledge_by_filter_form.submit(); }" title="Unacknowledge all alarms that match the current search constraints, even those not shown on the screen">Unacknowledge entire search</a>
             <% } %>
-          </li>
         <% } %>
       <% } %>
-      </ul>
+      </div>
       </div>
       <!-- end menu -->
+<div class="row">
+    <br/>
+</div>
 
+    <jsp:include page="/includes/alarm-querypanel.jsp" flush="false" />
+
+<div class="row">
+    <br/>
+</div>
 
-            <jsp:include page="/includes/alarm-querypanel.jsp" flush="false" />
-          
             <% if( alarmCount > 0 ) { %>
               <% String baseUrl = this.makeLink(parms); %>
               <jsp:include page="/includes/resultsIndex.jsp" flush="false" >
@@ -260,8 +275,19 @@
               </jsp:include>
             <% } %>          
 
-
             <% if( parms.filters.size() > 0 || parms.ackType == AcknowledgeType.UNACKNOWLEDGED || parms.ackType == AcknowledgeType.ACKNOWLEDGED ) { %>
+                <div class="col-sm-6 col-md-9">
+                    <onms:filters
+                            context="/alarm/ncs-alarms"
+                            favorite="${favorite}"
+                            parameters="${parms}"
+                            showRemoveLink="true"
+                            showAcknowledgeFilter="true"
+                            acknowledgeFilterPrefix="Alarm(s)"
+                            acknowledgeFilterSuffix="alarm(s)"
+                            callback="${callback}" />
+                </div>
+
               <% int length = parms.filters.size(); %>
               <p>Search constraints:
                   <% if( parms.ackType == AcknowledgeType.UNACKNOWLEDGED ) { %>
@@ -278,13 +304,13 @@
             <% } %>
 
       <% if( req.isUserInRole( Authentication.ROLE_ADMIN ) || !req.isUserInRole( Authentication.ROLE_READONLY ) ) { %>
-          <form action="<%= Util.calculateUrlBase(request, "alarm/acknowledge") %>" method="post" name="alarm_action_form">
+          <form class="form-inline" action="<%= Util.calculateUrlBase(request, "alarm/acknowledge") %>" method="post" name="alarm_action_form">
           <input type="hidden" name="redirectParms" value="<c:out value="<%=req.getQueryString()%>"/>" />
           <input type="hidden" name="actionCode" value="<%=action%>" />
           <%=Util.makeHiddenTags(req)%>
       <% } %>
-            <jsp:include page="/includes/key.jsp" flush="false" />
-      <table>
+
+      <table class="table table-condensed severity">
                 <thead>
                     <tr>
                                              <% if( req.isUserInRole( Authentication.ROLE_ADMIN ) || !req.isUserInRole( Authentication.ROLE_READONLY ) ) { %>
@@ -507,9 +533,9 @@
             <hr />
              <p><%=alarms.length%> alarms &nbsp;
       <% if( req.isUserInRole( Authentication.ROLE_ADMIN ) || !req.isUserInRole( Authentication.ROLE_READONLY ) ) { %>
-          <input TYPE="reset" />
-          <input TYPE="button" VALUE="Select All" onClick="checkAllCheckboxes()"/>
-          <select name="alarmAction">
+          <input class="btn btn-default" TYPE="reset" />
+          <input class="btn btn-default" TYPE="button" VALUE="Select All" onClick="checkAllCheckboxes()"/>
+          <select class="form-control" name="alarmAction">
         <% if( parms.ackType == AcknowledgeType.UNACKNOWLEDGED ) { %>
           <option value="acknowledge">Acknowledge Alarms</option>
         <% } else if( parms.ackType == AcknowledgeType.ACKNOWLEDGED ) { %>
@@ -518,7 +544,7 @@
           <option value="clear">Clear Alarms</option>
           <option value="escalate">Escalate Alarms</option>
           </select>
-          <input type="button" value="Go" onClick="submitForm(document.alarm_action_form.alarmAction.value)" />
+          <input class="btn btn-default" type="button" value="Go" onClick="submitForm(document.alarm_action_form.alarmAction.value)" />
       <% } %>
         </p>
       </form>
@@ -541,8 +567,7 @@
             <% } %>
 
 
-<jsp:include page="/includes/bookmark.jsp" flush="false" />
-<jsp:include page="/includes/footer.jsp" flush="false" />
+<jsp:include page="/includes/bootstrap-footer.jsp" flush="false" />
 
 
 <%!