diff --git a/public/app/features/dashboard/dashgrid/EditorTabBody.tsx b/public/app/features/dashboard/dashgrid/EditorTabBody.tsx
index 2cd247ed704..822507c5c11 100644
--- a/public/app/features/dashboard/dashgrid/EditorTabBody.tsx
+++ b/public/app/features/dashboard/dashgrid/EditorTabBody.tsx
@@ -25,7 +25,7 @@ export interface EditorToolbarView {
   icon?: string;
   disabled?: boolean;
   onClick?: () => void;
-  render?: (closeFunction?: any) => JSX.Element | JSX.Element[];
+  render?: () => JSX.Element;
   action?: () => void;
   buttonType: ToolbarButtonType;
 }
diff --git a/public/app/features/dashboard/dashgrid/StateHistory.tsx b/public/app/features/dashboard/dashgrid/StateHistory.tsx
index c2998190841..99229b41848 100644
--- a/public/app/features/dashboard/dashgrid/StateHistory.tsx
+++ b/public/app/features/dashboard/dashgrid/StateHistory.tsx
@@ -69,41 +69,39 @@ class StateHistory extends PureComponent<Props, State> {
 
     return (
       <div>
-        <div style={{ margin: '0 auto', maxWidth: '720px' }}>
-          {stateHistoryItems.length > 0 && (
-            <div style={{ marginBottom: '15px' }}>
-              <span className="muted">Last 50 state changes</span>
-              <button className="btn btn-mini btn-danger pull-right" onClick={this.clearHistory}>
-                <i className="fa fa-trash" /> {` Clear history`}
-              </button>
-            </div>
-          )}
-          <ol className="alert-rule-list">
-            {stateHistoryItems.length > 0 ? (
-              stateHistoryItems.map((item, index) => {
-                return (
-                  <li className="alert-rule-item" key={`${item.time}-${index}`}>
-                    <div className={`alert-rule-item__icon ${item.stateModel.stateClass}`}>
-                      <i className={item.stateModel.iconClass} />
-                    </div>
-                    <div className="alert-rule-item__body">
-                      <div className="alert-rule-item__header">
-                        <p className="alert-rule-item__name">{item.alertName}</p>
-                        <div className="alert-rule-item__text">
-                          <span className={`${item.stateModel.stateClass}`}>{item.stateModel.text}</span>
-                        </div>
+        {stateHistoryItems.length > 0 && (
+          <div className="p-b-1">
+            <span className="muted">Last 50 state changes</span>
+            <button className="btn btn-mini btn-danger pull-right" onClick={this.clearHistory}>
+              <i className="fa fa-trash" /> {` Clear history`}
+            </button>
+          </div>
+        )}
+        <ol className="alert-rule-list">
+          {stateHistoryItems.length > 0 ? (
+            stateHistoryItems.map((item, index) => {
+              return (
+                <li className="alert-rule-item" key={`${item.time}-${index}`}>
+                  <div className={`alert-rule-item__icon ${item.stateModel.stateClass}`}>
+                    <i className={item.stateModel.iconClass} />
+                  </div>
+                  <div className="alert-rule-item__body">
+                    <div className="alert-rule-item__header">
+                      <p className="alert-rule-item__name">{item.alertName}</p>
+                      <div className="alert-rule-item__text">
+                        <span className={`${item.stateModel.stateClass}`}>{item.stateModel.text}</span>
                       </div>
-                      {item.info}
                     </div>
-                    <div className="alert-rule-item__time">{item.time}</div>
-                  </li>
-                );
-              })
-            ) : (
-              <i>No state changes recorded</i>
-            )}
-          </ol>
-        </div>
+                    {item.info}
+                  </div>
+                  <div className="alert-rule-item__time">{item.time}</div>
+                </li>
+              );
+            })
+          ) : (
+            <i>No state changes recorded</i>
+          )}
+        </ol>
       </div>
     );
   }
diff --git a/public/sass/pages/_alerting.scss b/public/sass/pages/_alerting.scss
index 77752be11bc..f285ab753ff 100644
--- a/public/sass/pages/_alerting.scss
+++ b/public/sass/pages/_alerting.scss
@@ -107,6 +107,7 @@
   display: flex;
   flex-direction: column;
   flex-grow: 1;
+  justify-content: center;
   overflow: hidden;
 }