diff --git a/ui/src/kapacitor/components/KapacitorRules.js b/ui/src/kapacitor/components/KapacitorRules.js
index ab1fd1e91..860c1d278 100644
--- a/ui/src/kapacitor/components/KapacitorRules.js
+++ b/ui/src/kapacitor/components/KapacitorRules.js
@@ -54,51 +54,50 @@ const KapacitorRules = ({
 
   return (
     <PageContents source={source}>
-      <div className="panel-heading">
-        <h2 className="panel-title">
-          {builderHeader}
-        </h2>
-        <div className="u-flex u-ai-center u-jc-space-between">
-          <Link
-            to={`/sources/${source.id}/alert-rules/new`}
-            className="btn btn-sm btn-primary"
-            style={{marginRight: '4px'}}
-          >
-            <span className="icon plus" /> Build Alert Rule
-          </Link>
+      <div className="panel">
+        <div className="panel-heading">
+          <h2 className="panel-title">
+            {builderHeader}
+          </h2>
+          <div className="u-flex u-ai-center u-jc-space-between">
+            <Link
+              to={`/sources/${source.id}/alert-rules/new`}
+              className="btn btn-sm btn-primary"
+              style={{marginRight: '4px'}}
+            >
+              <span className="icon plus" /> Build Alert Rule
+            </Link>
+          </div>
+        </div>
+        <div className="panel-body">
+          <KapacitorRulesTable
+            source={source}
+            rules={builderRules}
+            onDelete={onDelete}
+            onChangeRuleStatus={onChangeRuleStatus}
+          />
         </div>
       </div>
-      <KapacitorRulesTable
-        source={source}
-        rules={builderRules}
-        onDelete={onDelete}
-        onChangeRuleStatus={onChangeRuleStatus}
-      />
-
-      <div className="row">
-        <div className="col-md-12">
-          <div className="panel">
-            <div className="panel-heading">
-              <h2 className="panel-title">
-                {scriptsHeader}
-              </h2>
-              <div className="u-flex u-ai-center u-jc-space-between">
-                <Link
-                  to={`/sources/${source.id}/tickscript/new`}
-                  className="btn btn-sm btn-success"
-                  style={{marginRight: '4px'}}
-                >
-                  <span className="icon plus" /> Write TICKscript
-                </Link>
-              </div>
-            </div>
-            <TasksTable
-              source={source}
-              tasks={rules}
-              onDelete={onDelete}
-              onChangeRuleStatus={onChangeRuleStatus}
-            />
-          </div>
+      <div className="panel">
+        <div className="panel-heading">
+          <h2 className="panel-title">
+            {scriptsHeader}
+          </h2>
+          <Link
+            to={`/sources/${source.id}/tickscript/new`}
+            className="btn btn-sm btn-success"
+            style={{marginRight: '4px'}}
+          >
+            <span className="icon plus" /> Write TICKscript
+          </Link>
+        </div>
+        <div className="panel-body">
+          <TasksTable
+            source={source}
+            tasks={rules}
+            onDelete={onDelete}
+            onChangeRuleStatus={onChangeRuleStatus}
+          />
         </div>
       </div>
     </PageContents>
@@ -125,9 +124,7 @@ const PageContents = ({children}) =>
       <div className="container-fluid">
         <div className="row">
           <div className="col-md-12">
-            <div className="panel">
-              {children}
-            </div>
+            {children}
           </div>
         </div>
       </div>
diff --git a/ui/src/kapacitor/components/KapacitorRulesTable.js b/ui/src/kapacitor/components/KapacitorRulesTable.js
index 840011d9b..df0116144 100644
--- a/ui/src/kapacitor/components/KapacitorRulesTable.js
+++ b/ui/src/kapacitor/components/KapacitorRulesTable.js
@@ -15,35 +15,33 @@ const {
 } = TASKS_TABLE
 
 const KapacitorRulesTable = ({rules, source, onDelete, onChangeRuleStatus}) =>
-  <div className="panel-body">
-    <table className="table v-center table-highlight">
-      <thead>
-        <tr>
-          <th style={{minWidth: colName}}>Name</th>
-          <th style={{width: colTrigger}}>Rule Type</th>
-          <th style={{width: colMessage}}>Message</th>
-          <th style={{width: colAlerts}}>Alert Handlers</th>
-          <th style={{width: colEnabled}} className="text-center">
-            Task Enabled
-          </th>
-          <th style={{width: colActions}} />
-        </tr>
-      </thead>
-      <tbody>
-        {_.sortBy(rules, r => r.name.toLowerCase()).map(rule => {
-          return (
-            <RuleRow
-              key={rule.id}
-              rule={rule}
-              source={source}
-              onDelete={onDelete}
-              onChangeRuleStatus={onChangeRuleStatus}
-            />
-          )
-        })}
-      </tbody>
-    </table>
-  </div>
+  <table className="table v-center table-highlight">
+    <thead>
+      <tr>
+        <th style={{minWidth: colName}}>Name</th>
+        <th style={{width: colTrigger}}>Rule Type</th>
+        <th style={{width: colMessage}}>Message</th>
+        <th style={{width: colAlerts}}>Alert Handlers</th>
+        <th style={{width: colEnabled}} className="text-center">
+          Task Enabled
+        </th>
+        <th style={{width: colActions}} />
+      </tr>
+    </thead>
+    <tbody>
+      {_.sortBy(rules, r => r.name.toLowerCase()).map(rule => {
+        return (
+          <RuleRow
+            key={rule.id}
+            rule={rule}
+            source={source}
+            onDelete={onDelete}
+            onChangeRuleStatus={onChangeRuleStatus}
+          />
+        )
+      })}
+    </tbody>
+  </table>
 
 const handleDelete = (rule, onDelete) => onDelete(rule)
 
diff --git a/ui/src/kapacitor/components/TasksTable.js b/ui/src/kapacitor/components/TasksTable.js
index 84c079a76..bf48eb887 100644
--- a/ui/src/kapacitor/components/TasksTable.js
+++ b/ui/src/kapacitor/components/TasksTable.js
@@ -8,33 +8,31 @@ import {TASKS_TABLE} from 'src/kapacitor/constants/tableSizing'
 const {colName, colType, colEnabled, colActions} = TASKS_TABLE
 
 const TasksTable = ({tasks, source, onDelete, onChangeRuleStatus}) =>
-  <div className="panel-body">
-    <table className="table v-center table-highlight">
-      <thead>
-        <tr>
-          <th style={{minWidth: colName}}>Name</th>
-          <th style={{width: colType}}>Type</th>
-          <th style={{width: colEnabled}} className="text-center">
-            Task Enabled
-          </th>
-          <th style={{width: colActions}} />
-        </tr>
-      </thead>
-      <tbody>
-        {_.sortBy(tasks, t => t.id.toLowerCase()).map(task => {
-          return (
-            <TaskRow
-              key={task.id}
-              task={task}
-              source={source}
-              onDelete={onDelete}
-              onChangeRuleStatus={onChangeRuleStatus}
-            />
-          )
-        })}
-      </tbody>
-    </table>
-  </div>
+  <table className="table v-center table-highlight">
+    <thead>
+      <tr>
+        <th style={{minWidth: colName}}>Name</th>
+        <th style={{width: colType}}>Type</th>
+        <th style={{width: colEnabled}} className="text-center">
+          Task Enabled
+        </th>
+        <th style={{width: colActions}} />
+      </tr>
+    </thead>
+    <tbody>
+      {_.sortBy(tasks, t => t.id.toLowerCase()).map(task => {
+        return (
+          <TaskRow
+            key={task.id}
+            task={task}
+            source={source}
+            onDelete={onDelete}
+            onChangeRuleStatus={onChangeRuleStatus}
+          />
+        )
+      })}
+    </tbody>
+  </table>
 
 const handleDelete = (task, onDelete) => onDelete(task)
 
diff --git a/ui/src/style/theme/_panels.scss b/ui/src/style/theme/_panels.scss
index b109f0a43..5775643e5 100644
--- a/ui/src/style/theme/_panels.scss
+++ b/ui/src/style/theme/_panels.scss
@@ -9,6 +9,7 @@ $panel-gutter: 30px;
   display: flex;
   flex-direction: column;
   align-items: stretch;
+  margin-bottom: $panel-gutter;
 }
 
 .panel-heading {