From 34adf49df9f2903f85b302b10d92bf4e12d4c4a4 Mon Sep 17 00:00:00 2001
From: James <james@keen-studio.com>
Date: Sat, 16 Feb 2019 14:37:55 -0500
Subject: [PATCH 1/7] misc leftover locales

---
 src/components/modules/Localizer/index.js   |  2 +-
 src/components/utilities/SetLocale/index.js |  2 +-
 src/middleware/locale.js                    | 11 ++++++-----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/components/modules/Localizer/index.js b/src/components/modules/Localizer/index.js
index 623dc4249d..b9adfe4506 100644
--- a/src/components/modules/Localizer/index.js
+++ b/src/components/modules/Localizer/index.js
@@ -42,7 +42,7 @@ class Localizer extends Component {
 
             const newParams = {
               ...this.props.searchParams,
-              locale: locale
+              locale
             };
 
             const search = qs.stringify(newParams);
diff --git a/src/components/utilities/SetLocale/index.js b/src/components/utilities/SetLocale/index.js
index d854ae78f6..039f52e7d2 100644
--- a/src/components/utilities/SetLocale/index.js
+++ b/src/components/utilities/SetLocale/index.js
@@ -24,7 +24,7 @@ class SetLocale extends Component {
     const { searchParams, config, setLocale } = this.props;
 
     if (searchParams) {
-      if (searchParams.locales && config.localization.locales.indexOf(searchParams.locales) > -1) {
+      if (searchParams.locale && config.localization.locales.indexOf(searchParams.locale) > -1) {
         setLocale(searchParams.locale);
       } else if (!this.state.init) {
         setLocale(config.localization.defaultLocale);
diff --git a/src/middleware/locale.js b/src/middleware/locale.js
index 044028161c..f7560003ad 100644
--- a/src/middleware/locale.js
+++ b/src/middleware/locale.js
@@ -6,27 +6,28 @@ import languageParser from 'accept-language-parser';
  * @param localization
  * @returns {Function}
  */
+
 export default function locale(localization) {
   return function (req, res, next) {
     let setLocale;
     if (req.query.locale) {
-      setLocale = localization.languages.find(search => search === req.query.locale);
+      setLocale = localization.locales.find(search => search === req.query.locale);
       if (setLocale) {
         req.locale = setLocale;
       }
       if (req.query.locale === '*' || req.query.locale === 'all')
         return next();
     }
-    if (req.body.locale){
-      setLocale = localization.languages.find(search => search === req.body.locale);
+    if (req.body.locale) {
+      setLocale = localization.locales.find(search => search === req.body.locale);
       if (setLocale) {
         req.locale = setLocale;
       }
     }
     if (!req.locale && req.headers['accept-language'])
-      req.locale = languageParser.pick(localization.languages, req.headers['accept-language']);
+      req.locale = languageParser.pick(localization.locales, req.headers['accept-language']);
     if (!req.locale)
-      req.locale = localization.defaultLanguage;
+      req.locale = localization.defaultLocale;
 
     next();
   }

From a90b1ae5b50d810d9ee076a81e822a78418ff96c Mon Sep 17 00:00:00 2001
From: James <james@keen-studio.com>
Date: Sat, 16 Feb 2019 14:46:44 -0500
Subject: [PATCH 2/7] further ux refinements to localizer

---
 src/components/modules/Localizer/index.js   | 2 +-
 src/components/modules/Localizer/index.scss | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/components/modules/Localizer/index.js b/src/components/modules/Localizer/index.js
index b9adfe4506..775ea04426 100644
--- a/src/components/modules/Localizer/index.js
+++ b/src/components/modules/Localizer/index.js
@@ -49,7 +49,7 @@ class Localizer extends Component {
 
             return (
               <li key={i}>
-                <Link to={{ search }}>
+                <Link to={{ search }} onClick={this.toggleActive}>
                   {locale}
                 </Link>
               </li>
diff --git a/src/components/modules/Localizer/index.scss b/src/components/modules/Localizer/index.scss
index 53765bf759..0094f0af74 100644
--- a/src/components/modules/Localizer/index.scss
+++ b/src/components/modules/Localizer/index.scss
@@ -21,6 +21,14 @@
       height: rem(.25);
       margin-right: rem(.375);
     }
+
+    &:hover {
+      color: $primary;
+
+      svg {
+        @include color-svg($primary);
+      }
+    }
   }
 
   ul {

From 103d22e07cb8a3147ae8b14c211f2d9829ff4be4 Mon Sep 17 00:00:00 2001
From: James <james@keen-studio.com>
Date: Sat, 16 Feb 2019 15:24:07 -0500
Subject: [PATCH 3/7] removes dynamic collection routes, uses route param
 instead

---
 demo/Page/components/Edit/index.js       | 137 ++++++++++-------------
 demo/client/index.js                     |   8 +-
 demo/client/scss/overrides.scss          |   1 +
 src/components/data/edit.js              |   6 +-
 src/components/layout/Sidebar/index.js   |   6 +-
 src/components/modules/APIUrl/index.js   |  20 +++-
 src/components/modules/Status/index.scss |   5 +-
 src/components/routes/Collections.js     |  42 +++----
 8 files changed, 112 insertions(+), 113 deletions(-)

diff --git a/demo/Page/components/Edit/index.js b/demo/Page/components/Edit/index.js
index ceb203019b..bee2cd52ae 100644
--- a/demo/Page/components/Edit/index.js
+++ b/demo/Page/components/Edit/index.js
@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React from 'react';
 import {
   withEditData,
   EditView,
@@ -13,99 +13,78 @@ import {
   FormSubmit,
   Repeater
 } from 'payload/components';
-import { toKebabCase } from 'payload/utils';
 
-class Edit extends Component {
+const Edit = props => {
 
-  constructor(props) {
-    super(props);
+  const { id } = props.match.params;
 
-    const entrySlug = this.props.match.params.slug;
+  const { data, collection, config, locale } = props;
 
-    this.state = {
-      uid: entrySlug,
-      slug: entrySlug,
-      action: `${this.props.config.serverUrl}/${this.props.collection.slug}${entrySlug ? `/${entrySlug}` : ''}`,
-      method: entrySlug ? 'put' : 'post'
+  const sampleRepeaterValue = [
+    {
+      content: 'here\'s some test content'
+    }, {
+      content: 'here\'s some more test content'
     }
-  }
+  ];
 
-  setSlug = e => {
-    this.setState({ slug: toKebabCase(e.target.value) });
-  }
+  return (
+    <EditView data={data} collection={collection} isEditing={id ? true : false}>
+      <Form method={id ? 'put' : 'post'} action={`${config.serverUrl}/${collection.slug}${id ? `/${id}` : ''}`}>
+        <StickyAction content={
+          <APIUrl />
+        } action={
+          <React.Fragment>
+            <Button type="secondary">Preview</Button>
+            <FormSubmit>Save</FormSubmit>
+          </React.Fragment>
+        } />
 
-  render() {
+        <HiddenInput
+          name="locale"
+          valueOverride={locale} />
 
-    const initialData = this.props.data ? this.props.data : {};
+        <HiddenInput
+          name="slug"
+          valueOverride={id} />
 
-    const sampleRepeaterValue = [
-      {
-        content: 'here\'s some test content'
-      }, {
-        content: 'here\'s some more test content'
-      }
-    ];
+        <Input name="title"
+          label="Page Title"
+          maxLength={100}
+          initialValue={data['title']}
+          required />
 
-    return (
-      <EditView data={this.props.data} collection={this.props.collection} isEditing={this.props.match.params.slug ? true : false}>
-        <Form method={this.state.method} action={this.state.action}>
-          <StickyAction content={
-            <APIUrl serverUrl={this.props.config.serverUrl}
-              collectionSlug={this.props.collection.slug} slug={this.state.slug} />
-          } action={
-            <React.Fragment>
-              <Button type="secondary">Preview</Button>
-              <FormSubmit>Save</FormSubmit>
-            </React.Fragment>
-          } />
+        <Textarea name="content"
+          label="Content"
+          initialValue={data['content']}
+          height={100}
+          required />
 
-          <HiddenInput
-            name="locale"
-            valueOverride={this.props.locale} />
+        <Repeater
+          name="slides"
+          label="Slides"
+          initialValue={sampleRepeaterValue}>
+          <Textarea name="content" label="Content" />
+        </Repeater>
 
-          <HiddenInput
-            name="slug"
-            valueOverride={this.state.slug} />
-
-          <Input name="title"
-            onChange={this.setSlug}
-            label="Page Title"
+        <Group label="Meta Information">
+          <Input name="metaTitle"
             maxLength={100}
-            initialValue={initialData['title']}
-            required />
+            label="Meta Title"
+            width={50} />
 
-          <Textarea name="content"
-            label="Content"
-            initialValue={initialData['content']}
-            height={100}
-            required />
+          <Input name="metaKeywords"
+            maxLength={100}
+            label="Meta Keywords"
+            width={50} />
 
-          <Repeater
-            name="slides"
-            label="Slides"
-            initialValue={sampleRepeaterValue}>
-            <Textarea name="content" label="Content" />
-          </Repeater>
-
-          <Group label="Meta Information">
-            <Input name="metaTitle"
-              maxLength={100}
-              label="Meta Title"
-              width={50} />
-
-            <Input name="metaKeywords"
-              maxLength={100}
-              label="Meta Keywords"
-              width={50} />
-
-            <Textarea name="metaDesc"
-              label="Meta Description"
-              height={100} />
-          </Group>
-        </Form>
-      </EditView>
-    );
-  }
+          <Textarea name="metaDesc"
+            label="Meta Description"
+            height={100} />
+        </Group>
+      </Form>
+    </EditView>
+  );
 }
 
 export default withEditData(Edit);
diff --git a/demo/client/index.js b/demo/client/index.js
index 36967e0c35..c2990801d9 100644
--- a/demo/client/index.js
+++ b/demo/client/index.js
@@ -17,10 +17,10 @@ const views = {
   pages: pageViews
 };
 
-const collections = [
-  Page,
-  Order
-];
+const collections = {
+  orders: Order,
+  pages: Page
+}
 
 const Index = () => {
   return (
diff --git a/demo/client/scss/overrides.scss b/demo/client/scss/overrides.scss
index e69de29bb2..8b13789179 100644
--- a/demo/client/scss/overrides.scss
+++ b/demo/client/scss/overrides.scss
@@ -0,0 +1 @@
+
diff --git a/src/components/data/edit.js b/src/components/data/edit.js
index ee106ede44..8594f082aa 100644
--- a/src/components/data/edit.js
+++ b/src/components/data/edit.js
@@ -19,14 +19,14 @@ const withEditData = PassedComponent => {
     }
 
     fetchData = () => {
-      const slug = this.props.match.params.slug;
+      const { id } = this.props.match.params;
 
       const params = {
         locale: this.props.locale
       };
 
-      if (slug) {
-        api.requests.get(`${this.props.config.serverUrl}/${this.props.collection.slug}/${slug}`, params).then(
+      if (id) {
+        api.requests.get(`${this.props.config.serverUrl}/${this.props.collection.slug}/${id}`, params).then(
           res => this.setState({ data: res }),
           err => {
             console.warn(err);
diff --git a/src/components/layout/Sidebar/index.js b/src/components/layout/Sidebar/index.js
index 2d2d44e6fe..9dae336b8e 100644
--- a/src/components/layout/Sidebar/index.js
+++ b/src/components/layout/Sidebar/index.js
@@ -21,8 +21,8 @@ const Sidebar = props => {
       </Link>
       <span className="uppercase-label">Collections</span>
       <nav>
-        {props.collections && props.collections.map((item, i) => {
-          const href = `/collections/${item.slug}`;
+        {props.collections && Object.keys(props.collections).map((key, i) => {
+          const href = `/collections/${props.collections[key].slug}`;
           const classes = props.location.pathname.indexOf(href) > -1
             ? 'active'
             : undefined;
@@ -30,7 +30,7 @@ const Sidebar = props => {
           return (
             <Link className={classes} key={i} to={href}>
               <Arrow />
-              {props.collections[i].plural}
+              {props.collections[key].plural}
             </Link>
           );
         })}
diff --git a/src/components/modules/APIUrl/index.js b/src/components/modules/APIUrl/index.js
index d748efe774..2558422965 100644
--- a/src/components/modules/APIUrl/index.js
+++ b/src/components/modules/APIUrl/index.js
@@ -1,17 +1,31 @@
 import React from 'react';
+import { connect } from 'react-redux';
+import { withRouter } from 'react-router-dom';
 
 import './index.scss';
 
+const mapState = state => ({
+  locale: state.common.locale,
+  config: state.common.config
+})
+
 const APIUrl = props => {
 
-  const apiUrl = `${props.serverUrl}/${props.collectionSlug}/${props.slug ? `${props.slug}` : ''}`;
+  const { collectionSlug, id } = props.match.params;
+
+  const apiUrl = `${props.config.serverUrl}/${collectionSlug}/${id}`;
 
   return (
     <div className="api-url">
       <span className="uppercase-label">API URL</span>
-      <div className="url"><a href={apiUrl} rel="noopener noreferrer" target="_blank">{apiUrl}</a></div>
+      {id &&
+        <div className="url"><a href={apiUrl} rel="noopener noreferrer" target="_blank">{apiUrl}</a></div>
+      }
+      {!id &&
+        <div>&mdash;</div>
+      }
     </div>
   );
 };
 
-export default APIUrl;
+export default withRouter(connect(mapState)(APIUrl));
diff --git a/src/components/modules/Status/index.scss b/src/components/modules/Status/index.scss
index 6e556fa60c..c0e0d5ebb3 100644
--- a/src/components/modules/Status/index.scss
+++ b/src/components/modules/Status/index.scss
@@ -32,6 +32,9 @@
   }
 
   &.error {
-    background: $error;
+
+    .status-wrap {
+      background: $error;
+    }
   }
 }
diff --git a/src/components/routes/Collections.js b/src/components/routes/Collections.js
index 86dafeca78..bad01b497e 100644
--- a/src/components/routes/Collections.js
+++ b/src/components/routes/Collections.js
@@ -9,28 +9,30 @@ const mapState = state => ({
 
 const CollectionRoutes = props => {
 
-  return props.collections.map((collection, i) => {
-    if (collection) {
+  return (
+    <Switch>
+      <Route path={'/collections/:collectionSlug/create'} exact
+        render={routeProps => {
+          const { collectionSlug } = routeProps.match.params;
+          const Edit = props.views[collectionSlug].Edit;
+          return <Edit {...routeProps} collection={props.collections[collectionSlug]} config={props.config} />;
+        }} />
 
-      const Edit = props.views[collection.slug].Edit;
-      const Archive = props.views[collection.slug].Archive;
+      <Route path={'/collections/:collectionSlug/:id'} exact
+        render={routeProps => {
+          const { collectionSlug } = routeProps.match.params;
+          const Edit = props.views[routeProps.match.params.collectionSlug].Edit;
+          return <Edit {...routeProps} collection={props.collections[collectionSlug]} config={props.config} />;
+        }} />
 
-      return (
-        <Switch key={i}>
-          <Route path={`/collections/${collection.slug}/create`} exact
-            render={routeProps => <Edit {...routeProps} collection={collection} config={props.config} />} />
-
-          <Route path={`/collections/${collection.slug}/:slug`}
-            render={routeProps => <Edit {...routeProps} collection={collection} config={props.config} />} />
-
-          <Route path={`/collections/${collection.slug}`} exact
-            render={routeProps => <Archive {...routeProps} collection={collection} config={props.config} />} />
-        </Switch>
-      );
-    }
-
-    return null;
-  });
+      <Route path={'/collections/:collectionSlug'} exact
+        render={routeProps => {
+          const { collectionSlug } = routeProps.match.params;
+          const Archive = props.views[routeProps.match.params.collectionSlug].Archive;
+          return <Archive {...routeProps} collection={props.collections[collectionSlug]} config={props.config} />;
+        }} />
+    </Switch>
+  );
 };
 
 export default withRouter(connect(mapState)(CollectionRoutes));

From 7010df472927cf6a33da0bafecceae58ddd3d66f Mon Sep 17 00:00:00 2001
From: James <james@keen-studio.com>
Date: Sat, 16 Feb 2019 15:27:28 -0500
Subject: [PATCH 4/7] removes any type of autoKey present in Page model

---
 demo/Page/Page.config.js           | 1 -
 demo/Page/Page.model.js            | 1 -
 demo/Page/components/Edit/index.js | 9 ---------
 3 files changed, 11 deletions(-)

diff --git a/demo/Page/Page.config.js b/demo/Page/Page.config.js
index fdd11e2664..2405ec8570 100644
--- a/demo/Page/Page.config.js
+++ b/demo/Page/Page.config.js
@@ -3,7 +3,6 @@ export default {
   label: 'Pages',
   singular: 'Page',
   plural: 'Pages',
-  entrySlug: 'title',
   fields: [
     {
       name: 'title',
diff --git a/demo/Page/Page.model.js b/demo/Page/Page.model.js
index e8a8dc9908..75a1ddb0dc 100644
--- a/demo/Page/Page.model.js
+++ b/demo/Page/Page.model.js
@@ -8,7 +8,6 @@ const PageSchema = new mongoose.Schema({
   ...schemaBaseFields,
   title: { type: String, intl: true, unique: true },
   content: { type: String, intl: true },
-  slug: { type: String, intl: true, unique: true, required: true },
   metaTitle: String,
   metaDesc: String
 },
diff --git a/demo/Page/components/Edit/index.js b/demo/Page/components/Edit/index.js
index bee2cd52ae..eb3b58aebe 100644
--- a/demo/Page/components/Edit/index.js
+++ b/demo/Page/components/Edit/index.js
@@ -17,7 +17,6 @@ import {
 const Edit = props => {
 
   const { id } = props.match.params;
-
   const { data, collection, config, locale } = props;
 
   const sampleRepeaterValue = [
@@ -40,14 +39,6 @@ const Edit = props => {
           </React.Fragment>
         } />
 
-        <HiddenInput
-          name="locale"
-          valueOverride={locale} />
-
-        <HiddenInput
-          name="slug"
-          valueOverride={id} />
-
         <Input name="title"
           label="Page Title"
           maxLength={100}

From d3b145c6bf620ecfd9b4d1ca664838e8e31da803 Mon Sep 17 00:00:00 2001
From: James <james@keen-studio.com>
Date: Sat, 16 Feb 2019 15:33:51 -0500
Subject: [PATCH 5/7] moves locale hidden input to form (if necessary)

---
 demo/Page/Page.config.js                       |  1 +
 demo/Page/components/Edit/index.js             |  1 -
 src/components/forms/Form/index.js             | 12 ++++++++++--
 src/components/views/collections/Edit/index.js |  2 +-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/demo/Page/Page.config.js b/demo/Page/Page.config.js
index 2405ec8570..7001a3b7e7 100644
--- a/demo/Page/Page.config.js
+++ b/demo/Page/Page.config.js
@@ -3,6 +3,7 @@ export default {
   label: 'Pages',
   singular: 'Page',
   plural: 'Pages',
+  useAsTitle: 'title',
   fields: [
     {
       name: 'title',
diff --git a/demo/Page/components/Edit/index.js b/demo/Page/components/Edit/index.js
index eb3b58aebe..327f20a447 100644
--- a/demo/Page/components/Edit/index.js
+++ b/demo/Page/components/Edit/index.js
@@ -7,7 +7,6 @@ import {
   Button,
   Form,
   Input,
-  HiddenInput,
   Textarea,
   Group,
   FormSubmit,
diff --git a/src/components/forms/Form/index.js b/src/components/forms/Form/index.js
index 9c05afaabd..241c1c8e77 100644
--- a/src/components/forms/Form/index.js
+++ b/src/components/forms/Form/index.js
@@ -1,12 +1,17 @@
 import React, { Component, createContext } from 'react';
 import { withRouter } from 'react-router-dom';
-import { Status } from 'payload/components';
+import { connect } from 'react-redux';
+import { Status, HiddenInput } from 'payload/components';
 import api from 'payload/api';
 
 import './index.scss';
 
 export const FormContext = createContext({});
 
+const mapState = state => ({
+  searchParams: state.common.searchParams
+})
+
 class Form extends Component {
   constructor(props) {
     super(props);
@@ -125,6 +130,9 @@ class Form extends Component {
           processing: this.state.processing,
           submitted: this.state.submitted
         }}>
+          <HiddenInput
+            name="locale"
+            valueOverride={this.props.searchParams.locale} />
           {this.props.children}
         </FormContext.Provider>
       </form>
@@ -132,4 +140,4 @@ class Form extends Component {
   }
 }
 
-export default withRouter(Form);
+export default withRouter(connect(mapState)(Form));
diff --git a/src/components/views/collections/Edit/index.js b/src/components/views/collections/Edit/index.js
index 259314e394..4e0200f5fc 100644
--- a/src/components/views/collections/Edit/index.js
+++ b/src/components/views/collections/Edit/index.js
@@ -28,7 +28,7 @@ const EditView = props => {
         {props.isEditing &&
           <h1>
             Edit {props.data &&
-              props.data[props.collection.entrySlug]
+              props.data[props.collection.useAsTitle]
             }
           </h1>
         }

From 5a4b3721a76a2cad90dad40f69bf7cf3f9719835 Mon Sep 17 00:00:00 2001
From: James <james@keen-studio.com>
Date: Sat, 16 Feb 2019 15:39:32 -0500
Subject: [PATCH 6/7] misc improvements and bugfixes to Edit header

---
 src/components/utilities/SetSearchParams/index.js | 2 +-
 src/components/views/collections/Edit/index.js    | 4 ++--
 src/reducers/common.js                            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/utilities/SetSearchParams/index.js b/src/components/utilities/SetSearchParams/index.js
index 06fdb05af8..023d49a4bb 100644
--- a/src/components/utilities/SetSearchParams/index.js
+++ b/src/components/utilities/SetSearchParams/index.js
@@ -15,7 +15,7 @@ class SetSearchParams extends Component {
       { ignoreQueryPrefix: true }
     );
 
-    this.props.setParams(params);
+    this.props.setParams(params ? params : {});
   }
 
   componentDidMount() {
diff --git a/src/components/views/collections/Edit/index.js b/src/components/views/collections/Edit/index.js
index 4e0200f5fc..9880ecaf5a 100644
--- a/src/components/views/collections/Edit/index.js
+++ b/src/components/views/collections/Edit/index.js
@@ -27,8 +27,8 @@ const EditView = props => {
       <header>
         {props.isEditing &&
           <h1>
-            Edit {props.data &&
-              props.data[props.collection.useAsTitle]
+            Edit {Object.keys(props.data).length > 0 &&
+              (props.data[props.collection.useAsTitle] ? props.data[props.collection.useAsTitle] : '[Untitled]')
             }
           </h1>
         }
diff --git a/src/reducers/common.js b/src/reducers/common.js
index 169e9d967d..0dbb1a8cff 100644
--- a/src/reducers/common.js
+++ b/src/reducers/common.js
@@ -10,7 +10,7 @@ const defaultState = {
   locale: null,
   config: null,
   collections: null,
-  searchParams: null
+  searchParams: {}
 };
 
 export default (state = defaultState, action) => {

From a690c54d7f77b7fd7522c2d108e4ff29e2df9ffc Mon Sep 17 00:00:00 2001
From: James <james@keen-studio.com>
Date: Sat, 16 Feb 2019 18:52:01 -0500
Subject: [PATCH 7/7] updates Status styling and placement

---
 demo/Page/components/Edit/index.js            | 21 ++++---
 src/components.js                             |  2 +-
 src/components/forms/Form/index.js            | 37 +++++------
 src/components/modules/APIUrl/index.scss      |  1 -
 src/components/modules/Status/index.js        | 63 +++++++++----------
 src/components/modules/Status/index.scss      |  6 +-
 src/components/modules/StickyAction/index.js  | 19 ------
 src/components/modules/StickyHeader/index.js  | 24 +++++++
 .../{StickyAction => StickyHeader}/index.scss | 13 ++--
 .../views/collections/Edit/index.js           |  4 +-
 src/reducers/common.js                        | 27 +++++---
 11 files changed, 117 insertions(+), 100 deletions(-)
 delete mode 100644 src/components/modules/StickyAction/index.js
 create mode 100644 src/components/modules/StickyHeader/index.js
 rename src/components/modules/{StickyAction => StickyHeader}/index.scss (77%)

diff --git a/demo/Page/components/Edit/index.js b/demo/Page/components/Edit/index.js
index 327f20a447..73b2e84e7a 100644
--- a/demo/Page/components/Edit/index.js
+++ b/demo/Page/components/Edit/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import {
   withEditData,
   EditView,
-  StickyAction,
+  StickyHeader,
   APIUrl,
   Button,
   Form,
@@ -16,7 +16,7 @@ import {
 const Edit = props => {
 
   const { id } = props.match.params;
-  const { data, collection, config, locale } = props;
+  const { data, collection, config } = props;
 
   const sampleRepeaterValue = [
     {
@@ -29,14 +29,15 @@ const Edit = props => {
   return (
     <EditView data={data} collection={collection} isEditing={id ? true : false}>
       <Form method={id ? 'put' : 'post'} action={`${config.serverUrl}/${collection.slug}${id ? `/${id}` : ''}`}>
-        <StickyAction content={
-          <APIUrl />
-        } action={
-          <React.Fragment>
-            <Button type="secondary">Preview</Button>
-            <FormSubmit>Save</FormSubmit>
-          </React.Fragment>
-        } />
+        <StickyHeader showStatus={true}
+          content={
+            <APIUrl />
+          } action={
+            <React.Fragment>
+              <Button type="secondary">Preview</Button>
+              <FormSubmit>Save</FormSubmit>
+            </React.Fragment>
+          } />
 
         <Input name="title"
           label="Page Title"
diff --git a/src/components.js b/src/components.js
index 69b00801f1..c1cf8d30eb 100644
--- a/src/components.js
+++ b/src/components.js
@@ -37,7 +37,7 @@ export { default as Section } from './components/layout/Section';
 
 // Modules
 export { default as Status } from './components/modules/Status';
-export { default as StickyAction } from './components/modules/StickyAction';
+export { default as StickyHeader } from './components/modules/StickyHeader';
 export { default as HeadingButton } from './components/modules/HeadingButton';
 export { default as Filter } from './components/modules/Filter';
 export { default as APIUrl } from './components/modules/APIUrl';
diff --git a/src/components/forms/Form/index.js b/src/components/forms/Form/index.js
index 241c1c8e77..d8c0c624e7 100644
--- a/src/components/forms/Form/index.js
+++ b/src/components/forms/Form/index.js
@@ -1,7 +1,7 @@
 import React, { Component, createContext } from 'react';
 import { withRouter } from 'react-router-dom';
 import { connect } from 'react-redux';
-import { Status, HiddenInput } from 'payload/components';
+import { HiddenInput } from 'payload/components';
 import api from 'payload/api';
 
 import './index.scss';
@@ -12,6 +12,10 @@ const mapState = state => ({
   searchParams: state.common.searchParams
 })
 
+const mapDispatch = dispatch => ({
+  addStatus: status => dispatch({ type: 'ADD_STATUS', payload: status })
+})
+
 class Form extends Component {
   constructor(props) {
     super(props);
@@ -84,24 +88,20 @@ class Form extends Component {
           if (this.props.redirect) {
             this.props.history.push(this.props.redirect, data);
           } else {
-            this.setState({
-              status: {
-                message: res.message,
-                type: 'success'
-              },
-              processing: false
-            });
+            this.setState({ processing: false });
+            this.props.addStatus({
+              message: res.message,
+              type: 'success'
+            })
           }
         },
         error => {
           console.log(error);
-          this.setState({
-            status: {
-              message: error.message,
-              type: 'error'
-            },
-            processing: false
-          });
+          this.setState({ processing: false });
+          this.props.addStatus({
+            message: error.message,
+            type: 'error'
+          })
         }
       );
     }
@@ -119,11 +119,6 @@ class Form extends Component {
         method={this.props.method}
         action={this.props.action}
         className={this.props.className}>
-        {this.state.status && !this.state.redirect &&
-          <Status open={true}
-            type={this.state.status.type}
-            message={this.state.status.message} />
-        }
         <FormContext.Provider value={{
           setValue: this.setValue.bind(this),
           fields: this.state.fields,
@@ -140,4 +135,4 @@ class Form extends Component {
   }
 }
 
-export default withRouter(connect(mapState)(Form));
+export default withRouter(connect(mapState, mapDispatch)(Form));
diff --git a/src/components/modules/APIUrl/index.scss b/src/components/modules/APIUrl/index.scss
index 6db994fad3..1691f80032 100644
--- a/src/components/modules/APIUrl/index.scss
+++ b/src/components/modules/APIUrl/index.scss
@@ -1,6 +1,5 @@
 @import '~payload/scss/styles';
 
-
 .api-url {
   .url {
     overflow: hidden;
diff --git a/src/components/modules/Status/index.js b/src/components/modules/Status/index.js
index 96d0cc9369..73dbc09537 100644
--- a/src/components/modules/Status/index.js
+++ b/src/components/modules/Status/index.js
@@ -1,41 +1,40 @@
-import React, { Component } from 'react';
+import React from 'react';
+import { connect } from 'react-redux';
 import { Close } from 'payload/components';
 
 import './index.scss';
 
-class Status extends Component {
-  constructor(props) {
-    super(props);
+const mapState = state => ({
+  status: state.common.status
+})
 
-    this.state = {
-      open: this.props.open
-    }
+const mapDispatch = dispatch => ({
+  addStatus: status => dispatch({ type: 'ADD_STATUS', payload: status }),
+  removeStatus: i => dispatch({ type: 'REMOVE_STATUS', payload: i })
+})
+
+const Status = props => {
+  if (props.status.length > 0) {
+    return (
+      <ul className="status">
+        {props.status.map((status, i) => {
+          return (
+            <li className={status.type} key={i}>
+              {status.message}
+              <button className="close" onClick={e => {
+                e.preventDefault();
+                props.removeStatus(i)
+              }}>
+                <Close />
+              </button>
+            </li>
+          )
+        })}
+      </ul>
+    )
   }
 
-  componentDidUpdate(prevProps) {
-    if (prevProps.open !== this.props.open) {
-      this.setState({
-        open: this.props.open
-      })
-    }
-  }
-
-  render() {
-    if (this.state.open) {
-      return (
-        <div className={`status ${this.props.type}`}>
-          <div className="status-wrap">
-            {this.props.message}
-            <button className="close" onClick={() => this.setState({ open: false })}>
-              <Close />
-            </button>
-          </div>
-        </div>
-      )
-    }
-
-    return null;
-  }
+  return null;
 }
 
-export default Status;
+export default connect(mapState, mapDispatch)(Status);
diff --git a/src/components/modules/Status/index.scss b/src/components/modules/Status/index.scss
index c0e0d5ebb3..92f712fc78 100644
--- a/src/components/modules/Status/index.scss
+++ b/src/components/modules/Status/index.scss
@@ -2,15 +2,17 @@
 
 .status {
   @include gutter;
+  list-style: none;
+  padding: 0;
+  margin: 0;
 
-  .status-wrap {
+  li {
     @extend %uppercase-label;
     background: $primary;
     color: $black;
     font-weight: bold;
     border-radius: $radius-sm;
     padding: rem(.5);
-    margin-top: rem(.5);
     margin-bottom: rem(.5);
     display: flex;
     justify-content: space-between;
diff --git a/src/components/modules/StickyAction/index.js b/src/components/modules/StickyAction/index.js
deleted file mode 100644
index a86fcaa789..0000000000
--- a/src/components/modules/StickyAction/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import React from 'react';
-import { Sticky } from 'payload/components';
-
-import './index.scss';
-
-const StickyAction = props => {
-  return (
-    <Sticky className="action">
-      <div className="content">
-        {props.content}
-      </div>
-      <div className="controls">
-        {props.action}
-      </div>
-    </Sticky>
-  )
-}
-
-export default StickyAction;
diff --git a/src/components/modules/StickyHeader/index.js b/src/components/modules/StickyHeader/index.js
new file mode 100644
index 0000000000..d4420f558b
--- /dev/null
+++ b/src/components/modules/StickyHeader/index.js
@@ -0,0 +1,24 @@
+import React from 'react';
+import { Sticky, Status } from 'payload/components';
+
+import './index.scss';
+
+const StickyHeader = props => {
+  return (
+    <Sticky className="sticky-header">
+      {props.showStatus &&
+        <Status />
+      }
+      <div className="sticky-header-wrap">
+        <div className="content">
+          {props.content}
+        </div>
+        <div className="controls">
+          {props.action}
+        </div>
+      </div>
+    </Sticky>
+  )
+}
+
+export default StickyHeader;
diff --git a/src/components/modules/StickyAction/index.scss b/src/components/modules/StickyHeader/index.scss
similarity index 77%
rename from src/components/modules/StickyAction/index.scss
rename to src/components/modules/StickyHeader/index.scss
index 77175aed5c..4651133028 100644
--- a/src/components/modules/StickyAction/index.scss
+++ b/src/components/modules/StickyHeader/index.scss
@@ -1,12 +1,15 @@
 @import '~payload/scss/styles';
 
-.sticky.action {
+.sticky-header {
   @include gutter;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
 
-  > .content {
+  .sticky-header-wrap {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .content {
     flex-grow: 1;
     min-width: 0;
     padding-right: rem(1);
diff --git a/src/components/views/collections/Edit/index.js b/src/components/views/collections/Edit/index.js
index 9880ecaf5a..f1bb04cadb 100644
--- a/src/components/views/collections/Edit/index.js
+++ b/src/components/views/collections/Edit/index.js
@@ -12,8 +12,8 @@ const EditView = props => {
 
   if (props.isEditing) {
     nav.push({
-      url: `/collections/${props.collection.slug}/${props.data.slug}`,
-      label: props.data ? props.data[props.collection.entrySlug] : ''
+      url: `/collections/${props.collection.slug}/${props.data._id}`,
+      label: props.data ? props.data[props.collection.useAsTitle] : ''
     })
   } else {
     nav.push({
diff --git a/src/reducers/common.js b/src/reducers/common.js
index 0dbb1a8cff..ae8322a2fe 100644
--- a/src/reducers/common.js
+++ b/src/reducers/common.js
@@ -1,5 +1,4 @@
 const defaultState = {
-  menuStatus: false,
   scrollPos: 0,
   windowWidth: 1400,
   windowHeight: 900,
@@ -10,16 +9,12 @@ const defaultState = {
   locale: null,
   config: null,
   collections: null,
-  searchParams: {}
+  searchParams: {},
+  status: []
 };
 
 export default (state = defaultState, action) => {
   switch (action.type) {
-    case 'TOGGLE_MENU':
-      return {
-        ...state,
-        menuStatus: !state.menuStatus
-      };
 
     case 'UPDATE_SCROLL':
 
@@ -78,6 +73,24 @@ export default (state = defaultState, action) => {
         searchParams: action.payload
       }
 
+    case 'ADD_STATUS':
+      return {
+        ...state,
+        status: [
+          action.payload,
+          ...state.status
+        ]
+      };
+
+    case 'REMOVE_STATUS': {
+      const newStatus = [...state.status];
+      newStatus.splice(action.payload, 1);
+      return {
+        ...state,
+        status: newStatus
+      };
+    }
+
     default:
     //
   }