diff --git a/src/components/App.jsx b/src/components/App.jsx
index e3ddf0d..bac49eb 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -239,6 +239,7 @@ export default class App extends React.Component {
       onLayerSelect={this.onLayerSelect.bind(this)}
       selectedLayerIndex={this.state.selectedLayerIndex}
       layers={layers}
+      sources={this.state.sources}
     />
 
     const layerEditor = selectedLayer ? <LayerEditor
diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar.jsx
index 0a67d40..499d7a4 100644
--- a/src/components/Toolbar.jsx
+++ b/src/components/Toolbar.jsx
@@ -15,10 +15,8 @@ import MdInsertEmoticon from 'react-icons/lib/md/insert-emoticon'
 import MdFontDownload from 'react-icons/lib/md/font-download'
 import HelpIcon from 'react-icons/lib/md/help-outline'
 import InspectionIcon from 'react-icons/lib/md/find-in-page'
-import AddIcon from 'react-icons/lib/md/add-circle-outline'
 
 import logoImage from '../img/maputnik.png'
-import AddModal from './modals/AddModal'
 import SettingsModal from './modals/SettingsModal'
 import SourcesModal from './modals/SourcesModal'
 import OpenModal from './modals/OpenModal'
@@ -108,13 +106,6 @@ export default class Toolbar extends React.Component {
           isOpen={this.state.isOpen.sources}
           onOpenToggle={this.toggleModal.bind(this, 'sources')}
       />
-      <AddModal
-          mapStyle={this.props.mapStyle}
-          sources={this.props.sources}
-          isOpen={this.state.isOpen.add}
-          onOpenToggle={this.toggleModal.bind(this, 'add')}
-          onStyleChange={this.props.onStyleChanged}
-      />
       <ToolbarLink
         href={"https://github.com/maputnik/editor"}
         className="maputnik-toolbar-logo"
@@ -127,10 +118,6 @@ export default class Toolbar extends React.Component {
         <IconText>Open</IconText>
       </ToolbarAction>
       {this.downloadButton()}
-      <ToolbarAction onClick={this.toggleModal.bind(this, 'add')}>
-        <AddIcon />
-        <IconText>Add Layer</IconText>
-      </ToolbarAction>
       <ToolbarAction onClick={this.toggleModal.bind(this, 'sources')}>
         <SourcesIcon />
         <IconText>Sources</IconText>
diff --git a/src/components/inputs/AutocompleteInput.jsx b/src/components/inputs/AutocompleteInput.jsx
index 6c03a30..c2b4c1f 100644
--- a/src/components/inputs/AutocompleteInput.jsx
+++ b/src/components/inputs/AutocompleteInput.jsx
@@ -16,8 +16,7 @@ class AutocompleteInput extends React.Component {
   }
 
   render() {
-
-    const AutocompleteMenu = (items, value, style) => <div className={"maputnik-autocomplete-menu"} children={props.items} />
+    const AutocompleteMenu = (items, value, style) => <div className={"maputnik-autocomplete-menu"} children={items} />
 
     return <Autocomplete
       wrapperProps={{
diff --git a/src/components/layers/LayerList.jsx b/src/components/layers/LayerList.jsx
index 8fea83d..1f7c11a 100644
--- a/src/components/layers/LayerList.jsx
+++ b/src/components/layers/LayerList.jsx
@@ -4,6 +4,7 @@ import cloneDeep from 'lodash.clonedeep'
 import Button from '../Button'
 import LayerListItem from './LayerListItem'
 import AddIcon from 'react-icons/lib/md/add-circle-outline'
+import AddModal from '../modals/AddModal'
 
 import style from '../../libs/style.js'
 import {SortableContainer, SortableHandle, arrayMove} from 'react-sortable-hoc';
@@ -13,6 +14,7 @@ const layerListPropTypes = {
   selectedLayerIndex: React.PropTypes.number.isRequired,
   onLayersChange: React.PropTypes.func.isRequired,
   onLayerSelect: React.PropTypes.func,
+  sources: React.PropTypes.object.isRequired,
 }
 
 // List of collapsible layer editors
@@ -23,6 +25,15 @@ class LayerListContainer extends React.Component {
     onLayerSelect: () => {},
   }
 
+  constructor(props) {
+    super(props)
+    this.state = {
+      isOpen: {
+        add: false,
+      }
+    }
+  }
+
   onLayerDestroy(layerId) {
     const remainingLayers = this.props.layers.slice(0)
     const idx = style.indexOfLayer(remainingLayers, layerId)
@@ -53,6 +64,15 @@ class LayerListContainer extends React.Component {
     this.props.onLayersChange(changedLayers)
   }
 
+  toggleModal(modalName) {
+    this.setState({
+      isOpen: {
+        ...this.state.isOpen,
+        [modalName]: !this.state.isOpen[modalName]
+      }
+    })
+  }
+
   render() {
     const layerPanels = this.props.layers.map((layer, index) => {
       const layerId = layer.id
@@ -70,10 +90,21 @@ class LayerListContainer extends React.Component {
       />
     })
     return <div className="maputnik-layer-list">
+      <AddModal
+          layers={this.props.layers}
+          sources={this.props.sources}
+          isOpen={this.state.isOpen.add}
+          onOpenToggle={this.toggleModal.bind(this, 'add')}
+          onLayersChange={this.props.onLayersChange}
+      />
       <header className="maputnik-layer-list-header">
         <span>Layers</span>
         <span className="maputnik-space" />
-        <Button className="maputnik-add-layer">Add Layer</Button>
+        <Button
+          onClick={this.toggleModal.bind(this, 'add')}
+          className="maputnik-add-layer">
+      Add Layer
+      </Button>
       </header>
       <ul className="maputnik-layer-list-container">
         {layerPanels}
diff --git a/src/components/modals/AddModal.jsx b/src/components/modals/AddModal.jsx
index 8522d21..eb2dd7b 100644
--- a/src/components/modals/AddModal.jsx
+++ b/src/components/modals/AddModal.jsx
@@ -13,8 +13,8 @@ import LayerSourceLayerBlock from '../layers/LayerSourceLayerBlock'
 
 class AddModal extends React.Component {
   static propTypes = {
-    mapStyle: React.PropTypes.object.isRequired,
-    onStyleChange: React.PropTypes.func.isRequired,
+    layers: React.PropTypes.array.isRequired,
+    onLayersChange: React.PropTypes.func.isRequired,
     isOpen: React.PropTypes.bool.isRequired,
     onOpenToggle: React.PropTypes.func.isRequired,
 
@@ -23,7 +23,7 @@ class AddModal extends React.Component {
   }
 
   addLayer() {
-    const changedLayers = this.props.mapStyle.layers.slice(0)
+    const changedLayers = this.props.layers.slice(0)
     const layer = {
       id: this.state.id,
       type: this.state.type,
@@ -38,12 +38,7 @@ class AddModal extends React.Component {
 
     changedLayers.push(layer)
 
-    const changedStyle = {
-      ...this.props.mapStyle,
-      layers: changedLayers,
-    }
-
-    this.props.onStyleChange(changedStyle)
+    this.props.onLayersChange(changedLayers)
     this.props.onOpenToggle(false)
   }
 
diff --git a/src/styles/_layout.scss b/src/styles/_layout.scss
index 463bfa4..9db9a1e 100644
--- a/src/styles/_layout.scss
+++ b/src/styles/_layout.scss
@@ -13,34 +13,35 @@
 .maputnik-layout {
   font-family: $font-family;
   color: $color-white;
-}
-.maputnik-layout-list {
-  position: fixed;
-  bottom: 0px;
-  height: 100%;
-  top: 40px;
-  left: 0px;
-  z-index: 1;
-  width: 200px;
-  overflow: hidden;
-  background-color: $color-black;
-}
-.maputnik-layout-drawer {
-  position: fixed;
-  bottom: 0px;
-  height: 100%;
-  top: 40px;
-  left: 200px;
-  z-index: 1;
-  width: 350px;
-  background-color: $color-black;
-}
-.maputnik-layout-bottom {
-  position: fixed;
-  height: 50px;
-  bottom: 0px;
-  left: 550px;
-  z-index: 1;
-  width: 100%;
-  background-color: $color-black;
+
+  &-list {
+    position: fixed;
+    bottom: 0px;
+    height: 100%;
+    top: 40px;
+    left: 0px;
+    z-index: 3;
+    width: 200px;
+    overflow: hidden;
+    background-color: $color-black;
+  }
+  &-drawer {
+    position: fixed;
+    bottom: 0px;
+    height: 100%;
+    top: 40px;
+    left: 200px;
+    z-index: 1;
+    width: 350px;
+    background-color: $color-black;
+  }
+  &-bottom {
+    position: fixed;
+    height: 50px;
+    bottom: 0px;
+    left: 550px;
+    z-index: 1;
+    width: 100%;
+    background-color: $color-black;
+  }
 }