diff --git a/common/app/routes/Jobs/components/NewJob.jsx b/common/app/routes/Jobs/components/NewJob.jsx
index ed4aca7276..3c2c16bf37 100644
--- a/common/app/routes/Jobs/components/NewJob.jsx
+++ b/common/app/routes/Jobs/components/NewJob.jsx
@@ -143,7 +143,7 @@ export default contain({
       // sanitize user output
       const jobValues = {
         position: inHTMLData(position.value),
-        location: inHTMLData(locale.value),
+        locale: inHTMLData(locale.value),
         description: inHTMLData(description.value),
         email: inHTMLData(email.value),
         phone: inHTMLData(phone.value),
diff --git a/common/app/routes/Jobs/components/Preview.jsx b/common/app/routes/Jobs/components/Preview.jsx
index 5b6081be5c..7f7728c847 100644
--- a/common/app/routes/Jobs/components/Preview.jsx
+++ b/common/app/routes/Jobs/components/Preview.jsx
@@ -1,4 +1,6 @@
-// import React, { PropTypes } from 'react';
+import React, { PropTypes } from 'react';
+import { History } from 'react-router';
+import { Well, Button, Row } from 'react-bootstrap';
 import { contain } from 'thundercats-react';
 import ShowJob from './ShowJob.jsx';
 
@@ -10,5 +12,37 @@ export default contain(
       return { job };
     }
   },
-  ShowJob
+  React.createClass({
+    displayName: 'Preview',
+
+    mixins: [History],
+
+    propTypes: {
+      job: PropTypes.object
+    },
+
+    render() {
+      const { job } = this.props;
+      const { history } = this;
+      return (
+        <div>
+          <ShowJob job={ job } />
+          <Row>
+            <Well>
+              <Button
+                block={ true }
+                className='signup-btn' >
+                Looks great! Let's Check Out
+              </Button>
+              <Button
+                block={ true }
+                onClick={ () => history.goBack() } >
+                Head back and make edits
+              </Button>
+            </Well>
+          </Row>
+        </div>
+      );
+    }
+  })
 );
diff --git a/common/app/routes/Jobs/flux/Actions.js b/common/app/routes/Jobs/flux/Actions.js
index db7d84d8c9..5900e6dda1 100644
--- a/common/app/routes/Jobs/flux/Actions.js
+++ b/common/app/routes/Jobs/flux/Actions.js
@@ -57,7 +57,6 @@ export default Actions({
   saveForm: null,
   getSavedForm: null,
   setForm(form) {
-    form.locale = form.location;
     return { form };
   }
 })
diff --git a/common/models/job.json b/common/models/job.json
index f77fc6defa..49866b0a58 100644
--- a/common/models/job.json
+++ b/common/models/job.json
@@ -36,8 +36,13 @@
     "country": {
       "type": "string"
     },
+    "locale": {
+      "type": "string",
+      "description": "format: city, state"
+    },
     "location": {
-      "type": "geopoint"
+      "type": "geopoint",
+      "description": "location in lat, long"
     },
     "description": {
       "type": "string"