diff --git a/src/backends/github/AuthenticationPage.js b/src/backends/github/AuthenticationPage.js
index 319309d0..e1e3263e 100644
--- a/src/backends/github/AuthenticationPage.js
+++ b/src/backends/github/AuthenticationPage.js
@@ -7,7 +7,7 @@ import { Icon, Toast } from 'UI';
 export default class AuthenticationPage extends React.Component {
   static propTypes = {
     onLogin: PropTypes.func.isRequired,
-    inProgress: PropTypes.bool.isRequired,
+    inProgress: PropTypes.bool,
   };
 
   state = {};
diff --git a/src/backends/test-repo/AuthenticationPage.js b/src/backends/test-repo/AuthenticationPage.js
index ca38d68b..b9becaa1 100644
--- a/src/backends/test-repo/AuthenticationPage.js
+++ b/src/backends/test-repo/AuthenticationPage.js
@@ -5,7 +5,7 @@ import { Icon } from 'UI';
 export default class AuthenticationPage extends React.Component {
   static propTypes = {
     onLogin: PropTypes.func.isRequired,
-    inProgress: PropTypes.bool.isRequired,
+    inProgress: PropTypes.bool,
   };
 
   handleLogin = (e) => {
diff --git a/src/components/Editor/Editor.js b/src/components/Editor/Editor.js
index b0bb7ec5..2348f0c1 100644
--- a/src/components/Editor/Editor.js
+++ b/src/components/Editor/Editor.js
@@ -57,7 +57,6 @@ class Editor extends React.Component {
     showDelete: PropTypes.bool.isRequired,
     openMediaLibrary: PropTypes.func.isRequired,
     removeInsertedMedia: PropTypes.func.isRequired,
-    closeEntry: PropTypes.func.isRequired,
     fields: ImmutablePropTypes.list.isRequired,
     slug: PropTypes.string,
     newEntry: PropTypes.bool.isRequired,
diff --git a/src/components/Editor/EditorControlPane/Widget.js b/src/components/Editor/EditorControlPane/Widget.js
index 75c18bbb..18f3abb2 100644
--- a/src/components/Editor/EditorControlPane/Widget.js
+++ b/src/components/Editor/EditorControlPane/Widget.js
@@ -13,7 +13,6 @@ export default class Widget extends Component {
     hasActiveStyle: PropTypes.bool,
     setActiveStyle: PropTypes.func.isRequired,
     setInactiveStyle: PropTypes.func.isRequired,
-    className: PropTypes.string.isRequired,
     classNameWrapper: PropTypes.string.isRequired,
     classNameWidget: PropTypes.string.isRequired,
     classNameWidgetActive: PropTypes.string.isRequired,
diff --git a/src/components/EditorWidgets/List/ListControl.js b/src/components/EditorWidgets/List/ListControl.js
index 335ac808..1399697b 100644
--- a/src/components/EditorWidgets/List/ListControl.js
+++ b/src/components/EditorWidgets/List/ListControl.js
@@ -1,7 +1,7 @@
-import PropTypes from 'prop-types';
 import React, { Component } from 'react';
-import { List, Map, fromJS } from 'immutable';
+import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
+import { List, Map, fromJS } from 'immutable';
 import { partial } from 'lodash';
 import c from 'classnames';
 import { SortableContainer, SortableElement, SortableHandle } from 'react-sortable-hoc';
@@ -48,7 +48,10 @@ export default class ListControl extends Component {
   static propTypes = {
     onChange: PropTypes.func.isRequired,
     onChangeObject: PropTypes.func.isRequired,
-    value: PropTypes.node,
+    value: PropTypes.oneOfType([
+      ImmutablePropTypes.list,
+      PropTypes.string,
+    ]),
     field: PropTypes.node,
     forID: PropTypes.string,
     mediaPaths: ImmutablePropTypes.map.isRequired,
diff --git a/src/components/EditorWidgets/Markdown/MarkdownControl/Toolbar/Toolbar.js b/src/components/EditorWidgets/Markdown/MarkdownControl/Toolbar/Toolbar.js
index 6061b99e..34a06209 100644
--- a/src/components/EditorWidgets/Markdown/MarkdownControl/Toolbar/Toolbar.js
+++ b/src/components/EditorWidgets/Markdown/MarkdownControl/Toolbar/Toolbar.js
@@ -151,8 +151,8 @@ export default class Toolbar extends React.Component {
                 />
               }
             >
-              {plugins && plugins.toList().map(plugin => (
-                <DropdownItem label={plugin.get('label')} onClick={() => onSubmit(plugin.get('id'))} />
+              {plugins && plugins.toList().map((plugin, idx) => (
+                <DropdownItem key={idx} label={plugin.get('label')} onClick={() => onSubmit(plugin.get('id'))} />
               ))}
             </Dropdown>
           </div>
diff --git a/src/components/EditorWidgets/Markdown/MarkdownControl/Toolbar/ToolbarButton.js b/src/components/EditorWidgets/Markdown/MarkdownControl/Toolbar/ToolbarButton.js
index 026e6750..e01effe0 100644
--- a/src/components/EditorWidgets/Markdown/MarkdownControl/Toolbar/ToolbarButton.js
+++ b/src/components/EditorWidgets/Markdown/MarkdownControl/Toolbar/ToolbarButton.js
@@ -9,7 +9,7 @@ const ToolbarButton = ({ type, label, icon, onClick, isActive, disabled }) => {
   return (
     <button
       className={c('nc-toolbarButton-button', { ['nc-toolbarButton-active']: active })}
-      onClick={e => onClick(e, type)}
+      onClick={e => onClick && onClick(e, type)}
       title={label}
       disabled={disabled}
     >
@@ -22,7 +22,7 @@ ToolbarButton.propTypes = {
   type: PropTypes.string,
   label: PropTypes.string.isRequired,
   icon: PropTypes.string,
-  onClick: PropTypes.func.isRequired,
+  onClick: PropTypes.func,
   isActive: PropTypes.func,
   disabled: PropTypes.bool,
 };
diff --git a/src/components/EditorWidgets/Markdown/MarkdownControl/index.js b/src/components/EditorWidgets/Markdown/MarkdownControl/index.js
index 367858a8..b8f42780 100644
--- a/src/components/EditorWidgets/Markdown/MarkdownControl/index.js
+++ b/src/components/EditorWidgets/Markdown/MarkdownControl/index.js
@@ -17,7 +17,7 @@ export default class MarkdownControl extends React.Component {
     onAddAsset: PropTypes.func.isRequired,
     getAsset: PropTypes.func.isRequired,
     classNameWrapper: PropTypes.string.isRequired,
-    editorControl: PropTypes.node.isRequired,
+    editorControl: PropTypes.func.isRequired,
     value: PropTypes.string,
   };
 
diff --git a/src/components/EditorWidgets/Object/ObjectControl.js b/src/components/EditorWidgets/Object/ObjectControl.js
index 140fafd7..4b46ba54 100644
--- a/src/components/EditorWidgets/Object/ObjectControl.js
+++ b/src/components/EditorWidgets/Object/ObjectControl.js
@@ -51,7 +51,7 @@ export default class ObjectControl extends Component {
     return true;
   }
 
-  controlFor(field) {
+  controlFor(field, key) {
     const {
       onAddAsset,
       onOpenMediaLibrary,
@@ -72,6 +72,7 @@ export default class ObjectControl extends Component {
 
     return (
       <EditorControl
+        key={key}
         field={field}
         value={fieldValue}
         mediaPaths={mediaPaths}
@@ -91,7 +92,7 @@ export default class ObjectControl extends Component {
 
     if (multiFields) {
       return (<div id={forID} className={c(classNameWrapper, 'nc-objectControl-root')}>
-        {multiFields.map(f => this.controlFor(f))}
+        {multiFields.map((f, idx) => this.controlFor(f, idx))}
       </div>);
     } else if (singleField) {
       return this.controlFor(singleField);
diff --git a/src/components/EditorWidgets/Text/TextControl.js b/src/components/EditorWidgets/Text/TextControl.js
index e09ca5cb..93714807 100644
--- a/src/components/EditorWidgets/Text/TextControl.js
+++ b/src/components/EditorWidgets/Text/TextControl.js
@@ -26,7 +26,7 @@ export default class TextControl extends React.Component {
   render() {
     const {
       forID,
-      value = '',
+      value,
       onChange,
       classNameWrapper,
       setActiveStyle,
@@ -36,7 +36,7 @@ export default class TextControl extends React.Component {
     return (
       <Textarea
         id={forID}
-        value={value}
+        value={value || ''}
         className={classNameWrapper}
         onFocus={setActiveStyle}
         onBlur={setInactiveStyle}
diff --git a/src/components/UI/Modal/Modal.js b/src/components/UI/Modal/Modal.js
index 9d30d682..9fc8e097 100644
--- a/src/components/UI/Modal/Modal.js
+++ b/src/components/UI/Modal/Modal.js
@@ -10,6 +10,10 @@ export class Modal extends React.Component {
     onClose: PropTypes.func.isRequired,
   }
 
+  componentDidMount() {
+    ReactModal.setAppElement('#nc-root');
+  }
+
   render() {
     const { isOpen, children, className, onClose } = this.props;
     return (
@@ -20,6 +24,7 @@ export class Modal extends React.Component {
         className={{
           base: `nc-modal-body ${className || ''}`,
           afterOpen: 'nc-modal-body-opening',
+          beforeClose: '',
         }}
         overlayClassName={{
           base: 'nc-modal-overlay',