diff --git a/package-lock.json b/package-lock.json
index 745cbea..28f8bab 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3087,7 +3087,7 @@
     },
     "asynckit": {
       "version": "0.4.0",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k="
     },
     "at-least-node": {
@@ -4540,7 +4540,7 @@
     },
     "core-util-is": {
       "version": "1.0.2",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
       "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
@@ -5234,7 +5234,7 @@
     },
     "delayed-stream": {
       "version": "1.0.0",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
       "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk="
     },
     "delegates": {
@@ -11097,7 +11097,7 @@
     },
     "methods": {
       "version": "1.1.2",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
       "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4="
     },
     "microevent.ts": {
@@ -11865,7 +11865,7 @@
     },
     "object-assign": {
       "version": "4.1.1",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
     },
     "object-copy": {
@@ -12308,7 +12308,7 @@
     },
     "performance-now": {
       "version": "2.1.0",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
       "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
     },
     "picomatch": {
@@ -14416,7 +14416,7 @@
     },
     "react-textarea-autosize": {
       "version": "6.1.0",
-      "resolved": "http://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz",
       "integrity": "sha512-F6bI1dgib6fSvG8so1HuArPUv+iVEfPliuLWusLF+gAKz0FbB4jLrWUrTAeq1afnPT2c9toEZYUdz/y1uKMy4A==",
       "requires": {
         "prop-types": "^15.6.0"
@@ -17161,7 +17161,7 @@
     },
     "util-deprecate": {
       "version": "1.0.2",
-      "resolved": false,
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util.promisify": {
diff --git a/src/dashboard/dashboard-button-group.js b/src/dashboard/dashboard-button-group.js
index 7f49292..b2df4de 100644
--- a/src/dashboard/dashboard-button-group.js
+++ b/src/dashboard/dashboard-button-group.js
@@ -24,28 +24,28 @@ class DashboardButtonGroup extends React.Component {
   render() {
     const buttonStyle = {
       marginLeft: '12px',
-      height: '44px', 
+      height: '44px',
       width : '35px'
     };
 
     const iconStyle = {
       color: '#007bff',
-      height: '25px', 
+      height: '25px',
       width : '25px'
     }
 
     const buttons = [];
     let key = 0;
 
-    if (this.props.fullscreen) {
+    /*if (this.props.fullscreen) {
       return null;
-    }
+    }*/
 
     if (this.props.editing) {
       buttons.push(
         <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"save"}`}> Save changes </Tooltip>} >
         <Button variant= 'light' size="lg" key={key} onClick={this.props.onSave} style={buttonStyle}>
-          <Icon icon="save" style={iconStyle} /> 
+          <Icon icon="save" style={iconStyle} />
         </Button>
         </OverlayTrigger>,
         <OverlayTrigger key={key++}  placement={'bottom'} overlay={<Tooltip id={`tooltip-${"cancel"}`}> Discard changes </Tooltip>} >
@@ -59,17 +59,25 @@ class DashboardButtonGroup extends React.Component {
         buttons.push(
           <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"expand"}`}> Change to fullscreen view </Tooltip>} >
           <Button key={key} variant= 'light' size="lg" onClick={this.props.onFullscreen} style={buttonStyle}>
-            <Icon icon="expand" style={iconStyle}/> 
+            <Icon icon="expand" style={iconStyle}/>
           </Button>
           </OverlayTrigger>
         );
+      } else {
+        buttons.push(
+          <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"compress"}`}> Back to normal view </Tooltip>} >
+            <Button key={key} variant= 'light' size="lg" onClick={this.props.onFullscreen} style={buttonStyle}>
+              <Icon icon="compress" style={iconStyle}/>
+            </Button>
+          </OverlayTrigger>
+        );
       }
 
       if (this.props.paused) {
         buttons.push(
           <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"play"}`}> Continue simulation </Tooltip>} >
           <Button key={key} variant= 'light' size="lg" onClick={this.props.onUnpause} style={buttonStyle}>
-            <Icon icon="play" style={iconStyle}/> 
+            <Icon icon="play" style={iconStyle}/>
           </Button>
           </OverlayTrigger>
         );
@@ -77,44 +85,49 @@ class DashboardButtonGroup extends React.Component {
         buttons.push(
           <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"pause"}`}> Pause simulation </Tooltip>} >
           <Button key={key} variant= 'light' size="lg" onClick={this.props.onPause} style={buttonStyle}>
-            <Icon icon="pause" style={iconStyle}/> 
+            <Icon icon="pause" style={iconStyle}/>
           </Button>
           </OverlayTrigger>
         );
       }
 
-      buttons.push(
-        <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete files of scenario </Tooltip>} >
-        <Button key={key} variant= 'light' size="lg" onClick={this.props.onEditFiles} style={buttonStyle}>
-          <Icon icon="file" style={iconStyle}/>
-        </Button>
-        </OverlayTrigger>
-      );
+      if (this.props.fullscreen !== true) {
+        buttons.push(
+          <OverlayTrigger key={key++} placement={'bottom'}
+                          overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete files of scenario </Tooltip>}>
+            <Button key={key} variant='light' size="lg" onClick={this.props.onEditFiles} style={buttonStyle}>
+              <Icon icon="file" style={iconStyle}/>
+            </Button>
+          </OverlayTrigger>
+        );
 
-      buttons.push(
-        <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete input signals </Tooltip>} >
-        <Button key={key} variant= 'light' size="lg" onClick={this.props.onEditInputSignals} style={buttonStyle}>
-          <Icon icon="sign-in-alt" style={iconStyle}/>
-        </Button>
-        </OverlayTrigger>
-      );
+        buttons.push(
+          <OverlayTrigger key={key++} placement={'bottom'}
+                          overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete input signals </Tooltip>}>
+            <Button key={key} variant='light' size="lg" onClick={this.props.onEditInputSignals} style={buttonStyle}>
+              <Icon icon="sign-in-alt" style={iconStyle}/>
+            </Button>
+          </OverlayTrigger>
+        );
 
-      buttons.push(
-        <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete output signals </Tooltip>} >
-        <Button key={key} variant= 'light' size="lg" onClick={this.props.onEditOutputSignals} style={buttonStyle}>
-          <Icon icon="sign-out-alt" style={iconStyle}/>
-        </Button>
-        </OverlayTrigger>
-      );
-
-      buttons.push(
-        <OverlayTrigger key={key++} placement={'bottom'} overlay={<Tooltip id={`tooltip-${"layout"}`}> Add widgets and edit layout </Tooltip>} >
-        <Button key={key} variant= 'light' size="lg" onClick={this.props.onEdit} style={buttonStyle}>
-          <Icon icon="pen" style={iconStyle} /> 
-        </Button>
-        </OverlayTrigger>
-      );
+        buttons.push(
+          <OverlayTrigger key={key++} placement={'bottom'}
+                          overlay={<Tooltip id={`tooltip-${"file"}`}> Add, edit or delete output signals </Tooltip>}>
+            <Button key={key} variant='light' size="lg" onClick={this.props.onEditOutputSignals} style={buttonStyle}>
+              <Icon icon="sign-out-alt" style={iconStyle}/>
+            </Button>
+          </OverlayTrigger>
+        );
 
+        buttons.push(
+          <OverlayTrigger key={key++} placement={'bottom'}
+                          overlay={<Tooltip id={`tooltip-${"layout"}`}> Add widgets and edit layout </Tooltip>}>
+            <Button key={key} variant='light' size="lg" onClick={this.props.onEdit} style={buttonStyle}>
+              <Icon icon="pen" style={iconStyle}/>
+            </Button>
+          </OverlayTrigger>
+        );
+      }
     }
 
     return <div className='section-buttons-group-right'>
diff --git a/src/styles/app.css b/src/styles/app.css
index a2d887d..50ddfda 100644
--- a/src/styles/app.css
+++ b/src/styles/app.css
@@ -323,6 +323,7 @@ body {
   display: -webkit-flex;
   display: flex;
   flex-direction: column;
+  background-color: #FFFFFF;
 }
 
 .box-header {