diff --git a/components/CodeImage.js b/components/CodeImage.js
index 13359c1..27e6458 100644
--- a/components/CodeImage.js
+++ b/components/CodeImage.js
@@ -61,8 +61,7 @@ const DEFAULT_SETTINGS = {
         <Spinner />
         <style jsx>{`
           div {
-            width: 680px;
-            height: 500px;
+            height: 352px;
           }
         `}
         </style>
@@ -71,6 +70,7 @@ const DEFAULT_SETTINGS = {
     if (this.state.loading === false) {
       content = (
         <div id="container" style={containerStyle}>
+          { true ? <WindowControls /> : null }
           <CodeMirror className="CodeMirrorContainer" value={this.props.children} options={options} />
         </div>
       )
diff --git a/pages/index.js b/pages/index.js
index 6fb17ec..2ba7c71 100644
--- a/pages/index.js
+++ b/pages/index.js
@@ -28,7 +28,7 @@ class Index extends React.Component {
   constructor()  {
     super()
     this.state = {
-      bgColor: '#111111',
+      background: '#111111',
       theme: THEMES[0].id,
       language: 'javascript' // TODO LANGUAGES[0]
     }
@@ -66,7 +66,7 @@ class Index extends React.Component {
             <Toolbar
               save={this.save}
               upload={this.upload}
-              onBGChange={color => this.setState({ bgColor: color })}
+              onBGChange={color => this.setState({ background: color })}
               onThemeChange={theme => this.setState({ theme: theme.id })}
               onLanguageChange={language => this.setState({ language })}
               bg={this.state.bgColor}