diff --git a/src/App.css b/src/App.css
index 9a4fe38365..bc41479a15 100644
--- a/src/App.css
+++ b/src/App.css
@@ -11,7 +11,7 @@ body {
 }
 
 .expression-input textarea {
-    font-family: Menlo,Monaco,Consolas,'Courier New',monospace;
+    /* font-family: Menlo,Monaco,Consolas,'Courier New',monospace; */
     resize: none;
 }
 
diff --git a/src/Panel.tsx b/src/Panel.tsx
index 24706adb30..7a6b44e88a 100644
--- a/src/Panel.tsx
+++ b/src/Panel.tsx
@@ -234,14 +234,6 @@ class Panel extends Component<PanelProps, PanelState> {
         <Row>
           <Col>
             <Nav tabs>
-              <NavItem>
-                <NavLink
-                  className={this.props.options.type === 'graph' ? 'active' : ''}
-                  onClick={() => { this.setOptions({type: 'graph'}); }}
-                >
-                  Graph
-                </NavLink>
-              </NavItem>
               <NavItem>
                 <NavLink
                   className={this.props.options.type === 'table' ? 'active' : ''}
@@ -250,8 +242,26 @@ class Panel extends Component<PanelProps, PanelState> {
                   Table
                 </NavLink>
               </NavItem>
+              <NavItem>
+                <NavLink
+                  className={this.props.options.type === 'graph' ? 'active' : ''}
+                  onClick={() => { this.setOptions({type: 'graph'}); }}
+                >
+                  Graph
+                </NavLink>
+              </NavItem>
             </Nav>
             <TabContent activeTab={this.props.options.type}>
+              <TabPane tabId="table">
+                {this.props.options.type === 'table' &&
+                  <>
+                    <div className="table-controls">
+                      <TimeInput endTime={this.props.options.endTime} range={this.props.options.range} onChangeEndTime={this.handleChangeEndTime} />
+                    </div>
+                    <DataTable data={this.state.data} />
+                  </>
+                }
+              </TabPane>
               <TabPane tabId="graph">
                 {this.props.options.type === 'graph' &&
                   <>
@@ -270,16 +280,6 @@ class Panel extends Component<PanelProps, PanelState> {
                   </>
                 }
               </TabPane>
-              <TabPane tabId="table">
-                {this.props.options.type === 'table' &&
-                  <>
-                    <div className="table-controls">
-                      <TimeInput endTime={this.props.options.endTime} range={this.props.options.range} onChangeEndTime={this.handleChangeEndTime} />
-                    </div>
-                    <DataTable data={this.state.data} />
-                  </>
-                }
-              </TabPane>
             </TabContent>
           </Col>
         </Row>