diff --git a/src/components/MessagePanel.jsx b/src/components/MessagePanel.jsx
index c7ade55..1433b57 100644
--- a/src/components/MessagePanel.jsx
+++ b/src/components/MessagePanel.jsx
@@ -5,6 +5,7 @@ class MessagePanel extends React.Component {
   static propTypes = {
     errors: PropTypes.array,
     infos: PropTypes.array,
+    mapStyle: PropTypes.object,
   }
 
   render() {
@@ -15,7 +16,7 @@ class MessagePanel extends React.Component {
         const {mapStyle} = this.props;
         content = (
           <>
-            Layer <span>'{mapStyle.layers[parsed.data.index].id}'</span>: {parsed.data.message}
+            Layer <span>&apos;{mapStyle.layers[parsed.data.index].id}&apos;</span>: {parsed.data.message}
           </>
         );
       }
diff --git a/src/components/fields/FunctionSpecField.jsx b/src/components/fields/FunctionSpecField.jsx
index b0c0afc..eb8c1d2 100644
--- a/src/components/fields/FunctionSpecField.jsx
+++ b/src/components/fields/FunctionSpecField.jsx
@@ -62,6 +62,7 @@ export default class FunctionSpecProperty  extends React.Component {
       onChange: PropTypes.func.isRequired,
       fieldName: PropTypes.string.isRequired,
       fieldSpec: PropTypes.object.isRequired,
+      error: PropTypes.object,
 
       value: PropTypes.oneOfType([
       PropTypes.object,
diff --git a/src/components/fields/PropertyGroup.jsx b/src/components/fields/PropertyGroup.jsx
index 30515c3..e07c15f 100644
--- a/src/components/fields/PropertyGroup.jsx
+++ b/src/components/fields/PropertyGroup.jsx
@@ -40,6 +40,7 @@ export default class PropertyGroup extends React.Component {
     groupFields: PropTypes.array.isRequired,
     onChange: PropTypes.func.isRequired,
     spec: PropTypes.object.isRequired,
+    errors: PropTypes.array,
   }
 
   onPropertyChange = (property, newValue) => {
diff --git a/src/components/fields/_DataProperty.jsx b/src/components/fields/_DataProperty.jsx
index 4eaf37e..be48ddc 100644
--- a/src/components/fields/_DataProperty.jsx
+++ b/src/components/fields/_DataProperty.jsx
@@ -48,6 +48,7 @@ export default class DataProperty extends React.Component {
       PropTypes.bool,
       PropTypes.array
     ]),
+    error: PropTypes.object,
   }
 
   state = {
@@ -202,7 +203,6 @@ export default class DataProperty extends React.Component {
       <InputBlock
         error={this.props.error}
         fieldSpec={this.props.fieldSpec}
-        fieldSpec={this.props.fieldSpec}
         label={labelFromFieldName(this.props.fieldName)}
       >
         <div className="maputnik-data-spec-property-group">
diff --git a/src/components/fields/_ExpressionProperty.jsx b/src/components/fields/_ExpressionProperty.jsx
index 097457f..03fb201 100644
--- a/src/components/fields/_ExpressionProperty.jsx
+++ b/src/components/fields/_ExpressionProperty.jsx
@@ -19,7 +19,10 @@ export default class ExpressionProperty extends React.Component {
   static propTypes = {
     onDelete: PropTypes.func,
     fieldName: PropTypes.string,
-    fieldSpec: PropTypes.object
+    fieldSpec: PropTypes.object,
+    value: PropTypes.object,
+    error: PropTypes.object,
+    onChange: PropTypes.func,
   }
 
   constructor (props) {
diff --git a/src/components/fields/_SpecProperty.jsx b/src/components/fields/_SpecProperty.jsx
index 50215ef..e944cd9 100644
--- a/src/components/fields/_SpecProperty.jsx
+++ b/src/components/fields/_SpecProperty.jsx
@@ -13,7 +13,10 @@ export default class SpecProperty extends React.Component {
     onZoomClick: PropTypes.func.isRequired,
     onDataClick: PropTypes.func.isRequired,
     fieldName: PropTypes.string,
-    fieldSpec: PropTypes.object
+    fieldSpec: PropTypes.object,
+    value: PropTypes.any,
+    error: PropTypes.object,
+    onExpressionClick: PropTypes.func,
   }
 
   render() {
@@ -28,7 +31,6 @@ export default class SpecProperty extends React.Component {
     return <InputBlock
       error={this.props.error}
       fieldSpec={this.props.fieldSpec}
-      fieldSpec={this.props.fieldSpec}
       label={labelFromFieldName(this.props.fieldName)}
       action={functionBtn}
     >
diff --git a/src/components/fields/_ZoomProperty.jsx b/src/components/fields/_ZoomProperty.jsx
index f40b97a..1a1c494 100644
--- a/src/components/fields/_ZoomProperty.jsx
+++ b/src/components/fields/_ZoomProperty.jsx
@@ -44,6 +44,7 @@ export default class ZoomProperty extends React.Component {
     onAddStop: PropTypes.func,
     fieldName: PropTypes.string,
     fieldSpec: PropTypes.object,
+    error: PropTypes.object,
     value: PropTypes.oneOfType([
       PropTypes.object,
       PropTypes.string,
diff --git a/src/components/filter/FilterEditor.jsx b/src/components/filter/FilterEditor.jsx
index 5e41aea..1f7a1c5 100644
--- a/src/components/filter/FilterEditor.jsx
+++ b/src/components/filter/FilterEditor.jsx
@@ -27,6 +27,7 @@ export default class CombiningFilterEditor extends React.Component {
     /** Properties of the vector layer and the available fields */
     properties: PropTypes.object,
     filter: PropTypes.array,
+    errors: PropTypes.array,
     onChange: PropTypes.func.isRequired,
   }
 
diff --git a/src/components/inputs/InputBlock.jsx b/src/components/inputs/InputBlock.jsx
index f480b2d..378d345 100644
--- a/src/components/inputs/InputBlock.jsx
+++ b/src/components/inputs/InputBlock.jsx
@@ -18,6 +18,8 @@ class InputBlock extends React.Component {
     style: PropTypes.object,
     onChange: PropTypes.func,
     fieldSpec: PropTypes.object,
+    wideMode: PropTypes.bool,
+    error: PropTypes.object,
   }
 
   constructor (props) {
diff --git a/src/components/inputs/StringInput.jsx b/src/components/inputs/StringInput.jsx
index bbb7b22..c45e02c 100644
--- a/src/components/inputs/StringInput.jsx
+++ b/src/components/inputs/StringInput.jsx
@@ -12,6 +12,7 @@ class StringInput extends React.Component {
     multi: PropTypes.bool,
     required: PropTypes.bool,
     disabled: PropTypes.bool,
+    spellCheck: PropTypes.bool,
   }
 
   static defaultProps = {
diff --git a/src/components/layers/JSONEditor.jsx b/src/components/layers/JSONEditor.jsx
index eec0343..fe212c2 100644
--- a/src/components/layers/JSONEditor.jsx
+++ b/src/components/layers/JSONEditor.jsx
@@ -24,10 +24,15 @@ class JSONEditor extends React.Component {
     maxHeight: PropTypes.number,
     onChange: PropTypes.func,
     lineNumbers: PropTypes.bool,
+    lineWrapping: PropTypes.bool,
+    getValue: PropTypes.func,
+    gutters: PropTypes.array,
+    className: PropTypes.string,
   }
 
   static defaultProps = {
     lineNumbers: true,
+    lineWrapping: false,
     gutters: ["CodeMirror-lint-markers"],
     getValue: (data) => {
       return JSON.stringify(data, null, 2)
diff --git a/src/components/layers/LayerEditor.jsx b/src/components/layers/LayerEditor.jsx
index 538b11a..4c82a8f 100644
--- a/src/components/layers/LayerEditor.jsx
+++ b/src/components/layers/LayerEditor.jsx
@@ -58,6 +58,7 @@ export default class LayerEditor extends React.Component {
     isFirstLayer: PropTypes.bool,
     isLastLayer: PropTypes.bool,
     layerIndex: PropTypes.number,
+    errors: PropTypes.array,
   }
 
   static defaultProps = {
diff --git a/src/components/layers/LayerTypeBlock.jsx b/src/components/layers/LayerTypeBlock.jsx
index ea31bd1..4a4b2b3 100644
--- a/src/components/layers/LayerTypeBlock.jsx
+++ b/src/components/layers/LayerTypeBlock.jsx
@@ -11,6 +11,7 @@ class LayerTypeBlock extends React.Component {
     value: PropTypes.string.isRequired,
     wdKey: PropTypes.string,
     onChange: PropTypes.func.isRequired,
+    error: PropTypes.object,
   }
 
   render() {
diff --git a/src/components/layers/MaxZoomBlock.jsx b/src/components/layers/MaxZoomBlock.jsx
index 32ce51a..ee75f42 100644
--- a/src/components/layers/MaxZoomBlock.jsx
+++ b/src/components/layers/MaxZoomBlock.jsx
@@ -9,6 +9,7 @@ class MaxZoomBlock extends React.Component {
   static propTypes = {
     value: PropTypes.number,
     onChange: PropTypes.func.isRequired,
+    error: PropTypes.object,
   }
 
   render() {
diff --git a/src/components/layers/MinZoomBlock.jsx b/src/components/layers/MinZoomBlock.jsx
index b554bae..f3f9f1e 100644
--- a/src/components/layers/MinZoomBlock.jsx
+++ b/src/components/layers/MinZoomBlock.jsx
@@ -9,6 +9,7 @@ class MinZoomBlock extends React.Component {
   static propTypes = {
     value: PropTypes.number,
     onChange: PropTypes.func.isRequired,
+    error: PropTypes.object,
   }
 
   render() {
diff --git a/src/styles/_zoomproperty.scss b/src/styles/_zoomproperty.scss
index 7f45d98..1d59c9f 100644
--- a/src/styles/_zoomproperty.scss
+++ b/src/styles/_zoomproperty.scss
@@ -2,8 +2,6 @@
 .maputnik-make-zoom-function {
   background-color: transparent;
   display: inline-block;
-  padding-bottom: 0;
-  padding-top: 0;
   vertical-align: middle;
   padding: 0 $margin-2 0 0;
 
@@ -64,8 +62,6 @@
 .maputnik-make-data-function {
   background-color: transparent;
   display: inline-block;
-  padding-bottom: 0;
-  padding-top: 0;
   vertical-align: middle;
   padding: 0 $margin-2 0 0;