diff --git a/website/playground/EditorState.js b/website/playground/EditorState.js
index c70c3182..9dde7abe 100644
--- a/website/playground/EditorState.js
+++ b/website/playground/EditorState.js
@@ -8,15 +8,12 @@ export default class extends React.Component {
     super();
     this.state = Object.assign(
       {
-        sidebarExpanded: false,
-        astPanelVisible: false,
-        docPanelVisible: false,
-        toggleAstPanelVisible: () =>
-          this.setState(stateToggler("astPanelVisible")),
-        toggleDocPanelVisible: () =>
-          this.setState(stateToggler("docPanelVisible")),
-        toggleSidebarExpanded: () =>
-          this.setState(stateToggler("sidebarExpanded"))
+        showSidebar: false,
+        showAst: false,
+        showDoc: false,
+        toggleSidebar: () => this.setState(stateToggler("showSidebar")),
+        toggleAst: () => this.setState(stateToggler("showAst")),
+        toggleDoc: () => this.setState(stateToggler("showDoc"))
       },
       storage.get("editor_state")
     );
diff --git a/website/playground/Option.js b/website/playground/Option.js
index d1086dae..960e56a4 100644
--- a/website/playground/Option.js
+++ b/website/playground/Option.js
@@ -1,18 +1,17 @@
 import React from "react";
 
+import { Checkbox } from "./inputs";
+
 export function BooleanOption({ option, value, onChange }) {
   function maybeInvert(value) {
     return option.inverted ? !value : value;
   }
   return (
-    <label>
-      <input
-        type="checkbox"
-        checked={maybeInvert(value)}
-        onChange={ev => onChange(option, maybeInvert(ev.target.checked))}
-      />{" "}
-      {option.cliName}
-    </label>
+    <Checkbox
+      label={option.cliName}
+      checked={maybeInvert(value)}
+      onChange={checked => onChange(option, maybeInvert(checked))}
+    />
   );
 }
 
diff --git a/website/playground/Playground.js b/website/playground/Playground.js
index 349b3453..cd6ad94f 100644
--- a/website/playground/Playground.js
+++ b/website/playground/Playground.js
@@ -87,7 +87,7 @@ class Playground extends React.Component {
       formatted,
       loaded,
       options,
-      sidebarExpanded
+      showSidebar
     } = this.state;
 
     if (!loaded) return "Loading...";
@@ -99,13 +99,13 @@ class Playground extends React.Component {
             <div className="editors-container">
               <div
                 className={`options-container ${
-                  editorState.sidebarExpanded ? "open" : ""
+                  editorState.showSidebar ? "open" : ""
                 }`}
               >
                 <div className="options">
                   <SidebarOptions
                     availableOptions={availableOptions}
-                    currentOptions={options}
+                    prettierOptions={options}
                     onOptionValueChange={this.handleOptionValueChange}
                   />
                 </div>
@@ -116,10 +116,10 @@ class Playground extends React.Component {
                   value={content}
                   onChange={this.setContent}
                 />
-                {editorState.astPanelVisible ? (
+                {editorState.showAst ? (
                   <DebugPanel value={"ast here"} />
                 ) : null}
-                {editorState.docPanelVisible ? (
+                {editorState.showDoc ? (
                   <DebugPanel value={"doc here"} />
                 ) : null}
                 <OutputPanel mode="jsx" value={formatted} />
@@ -127,8 +127,8 @@ class Playground extends React.Component {
             </div>
             <div className="bottom-bar">
               <div className="bottom-bar-buttons">
-                <Button onClick={editorState.toggleSidebarExpanded}>
-                  {editorState.sidebarExpanded ? "Hide" : "Show"} options
+                <Button onClick={editorState.toggleSidebar}>
+                  {editorState.showSidebar ? "Hide" : "Show"} options
                 </Button>
                 <Button onClick={this.clearContent}>Clear</Button>
               </div>
diff --git a/website/playground/SidebarOptions.js b/website/playground/SidebarOptions.js
index e82051ee..73bcbf62 100644
--- a/website/playground/SidebarOptions.js
+++ b/website/playground/SidebarOptions.js
@@ -6,7 +6,7 @@ const CATEGORIES_ORDER = ["Global", "JavaScript", "Markdown", "Special"];
 
 export default function({
   availableOptions,
-  currentOptions,
+  prettierOptions,
   onOptionValueChange
 }) {
   const optionsByCategory = availableOptions.reduce((acc, option) => {
@@ -16,18 +16,22 @@ export default function({
     return acc;
   }, {});
 
-  return CATEGORIES_ORDER.map(category => (
-    <details key={category} className="sub-options" open="true">
-      <summary>{category}</summary>
+  return (
+    <div className="options">
+      {CATEGORIES_ORDER.map(category => (
+        <details key={category} className="sub-options" open="true">
+          <summary>{category}</summary>
 
-      {(optionsByCategory[category] || []).map(option => (
-        <Option
-          key={option.name}
-          option={option}
-          value={currentOptions[option.name]}
-          onChange={onOptionValueChange}
-        />
+          {(optionsByCategory[category] || []).map(option => (
+            <Option
+              key={option.name}
+              option={option}
+              value={prettierOptions[option.name]}
+              onChange={onOptionValueChange}
+            />
+          ))}
+        </details>
       ))}
-    </details>
-  ));
+    </div>
+  );
 }
diff --git a/website/playground/inputs.js b/website/playground/inputs.js
new file mode 100644
index 00000000..4cbfaf9a
--- /dev/null
+++ b/website/playground/inputs.js
@@ -0,0 +1,14 @@
+import React from "react";
+
+export function Checkbox({ label: _label, checked, onChange }) {
+  return (
+    <label>
+      <input
+        type="checkbox"
+        checked={checked}
+        onChange={ev => onChange(ev.target.checked)}
+      />{" "}
+      {_label}
+    </label>
+  );
+}