diff --git a/src/components/layers/LayerEditor.jsx b/src/components/layers/LayerEditor.jsx
index 7596a933..03f3e9df 100644
--- a/src/components/layers/LayerEditor.jsx
+++ b/src/components/layers/LayerEditor.jsx
@@ -1,11 +1,9 @@
 import React from 'react'
 
-import Toolbar from 'rebass/dist/Toolbar'
-import NavItem from 'rebass/dist/NavItem'
-
 import SourceEditor from './SourceEditor'
 import FilterEditor from '../filter/FilterEditor'
 import PropertyGroup from '../fields/PropertyGroup'
+import LayerEditorGroup from './LayerEditorGroup'
 
 import ScrollContainer from '../ScrollContainer'
 
@@ -37,7 +35,30 @@ export default class LayerEditor extends React.Component {
   }
 
   constructor(props) {
-    super(props);
+    super(props)
+
+    //TODO: Clean this up and refactor into function
+    const editorGroups = {}
+    layout[this.props.layer.type].groups.forEach(group => {
+      editorGroups[group.title] = true
+    })
+    editorGroups['Source'] = true
+
+    this.state = { editorGroups }
+  }
+
+  componentWillReceiveProps(nextProps) {
+    const additionalGroups = { ...this.state.editorGroups }
+
+    layout[nextProps.layer.type].groups.forEach(group => {
+      if(!(group.title in additionalGroups)) {
+        additionalGroups[group.title] = true
+      }
+    })
+
+    this.setState({
+      editorGroups: additionalGroups
+    })
   }
 
   getChildContext () {
@@ -71,41 +92,62 @@ export default class LayerEditor extends React.Component {
     this.props.onLayerChanged(changedLayer)
   }
 
+  onGroupToggle(groupTitle, active) {
+    const changedActiveGroups = {
+      ...this.state.editorGroups,
+      [groupTitle]: active,
+    }
+    this.setState({
+      editorGroups: changedActiveGroups
+    })
+  }
+
   render() {
+    console.log('editor groups', this.state.editorGroups)
     const layerType = this.props.layer.type
     const groups = layout[layerType].groups
     const propertyGroups = groups.map(group => {
-      return <PropertyGroup
-        key={this.props.group}
-        layer={this.props.layer}
-        groupFields={group.fields}
-        onChange={this.onPropertyChange.bind(this)}
-      />
+      return <LayerEditorGroup
+        key={group.title}
+        title={group.title}
+        isActive={this.state.editorGroups[group.title]}
+        onActiveToggle={this.onGroupToggle.bind(this, group.title)}
+      >
+        <PropertyGroup
+          layer={this.props.layer}
+          groupFields={group.fields}
+          onChange={this.onPropertyChange.bind(this)}
+        />
+      </LayerEditorGroup>
     })
 
+    let dataGroup = null
+    if(this.props.layer.type !== 'background') {
+      dataGroup = <LayerEditorGroup
+        title="Source"
+        isActive={this.state.editorGroups['Source']}
+        onActiveToggle={this.onGroupToggle.bind(this, 'Source')}
+      >
+        <FilterEditor
+          filter={this.props.layer.filter}
+          properties={this.props.vectorLayers[this.props.layer['source-layer']]}
+          onChange={f => this.onFilterChange(f)}
+        />
+        <SourceEditor
+          source={this.props.layer.source}
+          sourceLayer={this.props.layer['source-layer']}
+          sources={this.props.sources}
+          onSourceChange={console.log}
+          onSourceLayerChange={console.log}
+        />
+      </LayerEditorGroup>
+    }
+
     return <div style={{
         padding: theme.scale[0],
     }}>
-      <Toolbar>
-        <NavItem style={{fontWeight: 400}}>
-          {this.props.layer.id}
-        </NavItem>
-      </Toolbar>
-        {propertyGroups}
-           {this.props.layer.type !== 'background' && <div>
-          <FilterEditor
-            filter={this.props.layer.filter}
-            properties={this.props.vectorLayers[this.props.layer['source-layer']]}
-            onChange={f => this.onFilterChange(f)}
-          />
-          <SourceEditor
-            source={this.props.layer.source}
-            sourceLayer={this.props.layer['source-layer']}
-            sources={this.props.sources}
-            onSourceChange={console.log}
-            onSourceLayerChange={console.log}
-          />
-          </div>}
+      {propertyGroups}
+      {dataGroup}
     </div>
   }
 }
diff --git a/src/components/layers/LayerEditorGroup.jsx b/src/components/layers/LayerEditorGroup.jsx
new file mode 100644
index 00000000..60fe0407
--- /dev/null
+++ b/src/components/layers/LayerEditorGroup.jsx
@@ -0,0 +1,57 @@
+import React from 'react'
+import colors from '../../config/colors'
+import { margins, fontSizes } from '../../config/scales'
+
+import CollapseOpenIcon from 'react-icons/lib/md/arrow-drop-down'
+import CollapseCloseIcon from 'react-icons/lib/md/arrow-drop-up'
+
+class Collapser extends React.Component {
+  static propTypes = {
+    isCollapsed: React.PropTypes.bool.isRequired,
+  }
+
+  render() {
+    const iconStyle = {
+      width: 20,
+      height: 20,
+    }
+    return this.props.isCollapsed ? <CollapseCloseIcon style={iconStyle}/> : <CollapseOpenIcon style={iconStyle} />
+  }
+}
+
+export default class LayerEditorGroup extends React.Component {
+  static propTypes = {
+    title: React.PropTypes.string.isRequired,
+    isActive: React.PropTypes.bool.isRequired,
+    children: React.PropTypes.element.isRequired,
+    onActiveToggle: React.PropTypes.func.isRequired
+  }
+
+  render() {
+    return <div
+      onClick={e => this.props.onActiveToggle(!this.props.isActive)}
+    >
+      <div style={{
+        fontSize: fontSizes[4],
+        backgroundColor: colors.gray,
+        color: colors.lowgray,
+        padding: margins[1],
+        display: 'flex',
+        flexDirection: 'row',
+        lineHeight: '20px',
+      }}>
+        <span>{this.props.title}</span>
+        <span style={{flexGrow: 1}} />
+        <Collapser isCollapsed={this.props.isActive} />
+      </div>
+      <div style={{
+        display: this.props.isActive ? null : 'none',
+        border: 2,
+        borderStyle: 'solid',
+        borderColor: colors.gray,
+      }}>
+        {this.props.children}
+      </div>
+    </div>
+  }
+}