diff --git a/common/app/routes/Jobs/components/Jobs.jsx b/common/app/routes/Jobs/components/Jobs.jsx
index fec91fc342..31327b9ef1 100644
--- a/common/app/routes/Jobs/components/Jobs.jsx
+++ b/common/app/routes/Jobs/components/Jobs.jsx
@@ -66,22 +66,28 @@ export default contain(
               md={ 10 }
               mdOffset= { 1 }
               xs={ 12 }>
-              <h1 className='text-center'>Free Code Camps' Job Board</h1>
-              <Row>
+              <h1 className='text-center'>Job Opportunities</h1>
+              <Row className='text-center'>
                 <Col
-                  xs={ 10 }
-                  xsOffset={ 1 }>
-                  <p>
-                    Need to find the best junior developers?
-                    Post your job today!
+                  xs={ 12 }
+                  xsOffset={ 0 }>
+                  <p className='text-center large-p'>
+                    Talented web developers with strong portfolios are eager
+                    to work for your company.
                   </p>
+                </Col>
+                <Col
+                  xs={ 12 }
+                  sm={ 8 }
+                  smOffset={ 2 }>
                   <Button
-                    block={ true }
                     bsSize='large'
-                    className='signup-btn'
-                    onClick={ jobActions.openModal }>
-                    Post a job: $200 for 60 days.
+                    className='signup-btn btn-block'
+                    onClick={ ()=> {this.history.pushState(null, "/jobs/new")} }>
+                    Post a job: $200 for 30 days + weekly tweets
                   </Button>
+                  <div className='button-spacer' />
+                  <a href="https://twitter.com/CamperJobs" className="twitter-follow-button" data-show-count="false" data-size="large">Follow @CamperJobs</a>
                   <div className='spacer' />
                 </Col>
               </Row>
@@ -89,9 +95,6 @@ export default contain(
               { this.renderChild(children, jobs) ||
                 this.renderList(this.handleJobClick, jobs) }
               </Row>
-              <CreateJobModal
-                onHide={ jobActions.closeModal }
-                showModal={ showModal } />
             </Col>
           </Row>
         </Panel>
diff --git a/common/app/routes/Jobs/components/List.jsx b/common/app/routes/Jobs/components/List.jsx
index 368a376294..5bfb32c360 100644
--- a/common/app/routes/Jobs/components/List.jsx
+++ b/common/app/routes/Jobs/components/List.jsx
@@ -21,7 +21,8 @@ export default React.createClass({
         company,
         position,
         isHighlighted,
-        postedOn
+        postedOn,
+        locale
       }) => {
 
         const className = classnames({
@@ -36,12 +37,15 @@ export default React.createClass({
             onClick={ () => handleClick(id) }>
             <div>
               <h4 style={{ display: 'inline-block' }}>
-                <span>{ company }</span>
+                <span className='text-primary'>{ company }</span>
                 {' '}
                 <span className='hidden-xs hidden-sm'>
                   - { position }
                 </span>
                 {' '}
+                <span className='hidden-xs hidden-sm'>
+                  ({ locale })
+                </span>
               </h4>
               <h4
                 className='pull-right'
diff --git a/common/app/routes/Jobs/components/NewJob.jsx b/common/app/routes/Jobs/components/NewJob.jsx
index 611bd49f85..8aa6e05b21 100644
--- a/common/app/routes/Jobs/components/NewJob.jsx
+++ b/common/app/routes/Jobs/components/NewJob.jsx
@@ -207,14 +207,14 @@ export default contain({
                   onSubmit={ this.handleSubmit }>
 
                   <div className='spacer'>
-                    <h2>Job Information</h2>
+                    <h2>First, tell us about the position</h2>
                   </div>
                   <Input
                     bsStyle={ position.bsStyle }
-                    label='Position'
+                    label='Job Title'
                     labelClassName={ labelClass }
                     onChange={ (e) => handleChange('position', e) }
-                    placeholder='Position'
+                    placeholder='e.g. Full Stack Developer, Front End Developer, etc.'
                     required={ true }
                     type='text'
                     value={ position.value }
@@ -224,7 +224,7 @@ export default contain({
                     label='Location'
                     labelClassName={ labelClass }
                     onChange={ (e) => handleChange('locale', e) }
-                    placeholder='Location'
+                    placeholder='e.g. San Francisco, Remote, etc.'
                     required={ true }
                     type='text'
                     value={ locale.value }
@@ -234,7 +234,6 @@ export default contain({
                     label='Description'
                     labelClassName={ labelClass }
                     onChange={ (e) => handleChange('description', e) }
-                    placeholder='Description'
                     required={ true }
                     rows='10'
                     type='textarea'
@@ -242,14 +241,13 @@ export default contain({
                     wrapperClassName={ inputClass } />
 
                   <div className='divider'>
-                    <h2>Company Information</h2>
+                    <h2>Tell us about your organization</h2>
                   </div>
                   <Input
                     bsStyle={ company.bsStyle }
                     label='Company Name'
                     labelClassName={ labelClass }
                     onChange={ (e) => handleChange('company', e) }
-                    placeholder='Foo, INC'
                     type='text'
                     value={ company.value }
                     wrapperClassName={ inputClass } />
@@ -258,7 +256,7 @@ export default contain({
                     label='Email'
                     labelClassName={ labelClass }
                     onChange={ (e) => handleChange('email', e) }
-                    placeholder='Email'
+                    placeholder='you@yourcompany.com'
                     required={ true }
                     type='email'
                     value={ email.value }
@@ -268,7 +266,7 @@ export default contain({
                     label='Phone'
                     labelClassName={ labelClass }
                     onChange={ (e) => handleChange('phone', e) }
-                    placeholder='555-123-1234'
+                    placeholder='555-867-5309'
                     type='tel'
                     value={ phone.value }
                     wrapperClassName={ inputClass } />
@@ -277,7 +275,7 @@ export default contain({
                     label='URL'
                     labelClassName={ labelClass }
                     onChange={ (e) => handleChange('url', e) }
-                    placeholder='http://freecatphotoapp.com'
+                    placeholder='http://freecodecamp.com'
                     type='url'
                     value={ url.value }
                     wrapperClassName={ inputClass } />
@@ -292,11 +290,11 @@ export default contain({
                     wrapperClassName={ inputClass } />
 
                   <div className='divider'>
-                    <h2>Make it stand out</h2>
+                    <h2>Highlight your listing to make it stand out</h2>
                   </div>
                   <Input
                     checked={ highlight.value }
-                    label='Highlight your ad'
+                    label="&thinsp;&thinsp;&thinsp;Sure - I'll pay $50 more for that."
                     labelClassName={ 'col-sm-offset-1 col-sm-6'}
                     onChange={
                       ({ target: { checked } }) => handleForm({