diff --git a/app/components/project-long-description.js b/app/components/project-long-description.js
index ae7875f57..19ccef0b5 100644
--- a/app/components/project-long-description.js
+++ b/app/components/project-long-description.js
@@ -56,21 +56,21 @@ export default Component.extend({
   actions: {
 
     /**
-      Action that toggles edit mode.
+      Action that leaves edit mode without saving changes.
 
-      @method edit
+      @method cancel
      */
-    edit() {
-      this._enterEditMode();
+    cancel() {
+      this._enterReadMode();
     },
 
     /**
-      Action that leaves edit mode without saving changes.
+      Action that toggles edit mode.
 
-      @method cancel
+      @method edit
      */
-    cancel() {
-      this._enterReadMode();
+    edit() {
+      this._enterEditMode();
     },
 
     /**
diff --git a/app/index.html b/app/index.html
index 008312764..65b37a324 100644
--- a/app/index.html
+++ b/app/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
 
     <link rel="icon" href="https://d3pgew4wbk2vb1.cloudfront.net/icons/favicon.png">
     <link rel="icon" href="https://d3pgew4wbk2vb1.cloudfront.net/icons/favicon-32.png" sizes="32x32">
diff --git a/app/styles/components/project-long-description.scss b/app/styles/components/project-long-description.scss
index 00445797f..898863214 100644
--- a/app/styles/components/project-long-description.scss
+++ b/app/styles/components/project-long-description.scss
@@ -35,7 +35,7 @@
   margin-top: 10px;
   margin-bottom: 10px;
 
-  button.save {
+  .actions {
     float: right;
   }
 }
diff --git a/app/templates/components/editor-with-preview.hbs b/app/templates/components/editor-with-preview.hbs
index 9c90b8ca0..6175e3e32 100644
--- a/app/templates/components/editor-with-preview.hbs
+++ b/app/templates/components/editor-with-preview.hbs
@@ -11,6 +11,7 @@
 {{#if editing}}
   <div class="input-group">
     {{submittable-textarea
+      autoresize=true
       classNameBindings="textareaFocused:focused"
       max-height=350
       modifiedSubmit="modifiedSubmit"
diff --git a/app/templates/components/project-long-description.hbs b/app/templates/components/project-long-description.hbs
index dac20d9ee..035394d62 100644
--- a/app/templates/components/project-long-description.hbs
+++ b/app/templates/components/project-long-description.hbs
@@ -1,46 +1,55 @@
-{{#if descriptionIsBlank}}
-  <div class="long-description empty">
-    <div class="long-description-inner">
-      {{#if (can "manage project" project)}}
-        <div class="no-description user-can-add">
-          <h3>Add your project description.</h3>
-          <div class="box-icon"></div>
-          <p>Let's add some detailed information about your project:</p>
-          <ul>
-            <li>What do you hope to accomplish?</li>
-            <li>What real problem is this solving?</li>
-            <li>What kind of support will you need, both right now and in the future?</li>
-            <li>What risks and challenges will you face?</li>
-          </ul>
-        </div>
-      {{else}}
-        <div class="no-description user-cannot-add">
-          <h3>Nothing to see here!</h3>
-          <div class="box-icon"></div>
-          <p>Looks like this project is still getting set up!</p>
-        </div>
-      {{/if}}
-    </div>
-  </div>
-{{else}}
-  <div class="long-description">
-    {{#unless inEditMode}}
-      <div class="long-description-header">
-        <h3>About this project</h3>
+{{#unless isEditing}}
+  {{#if descriptionIsBlank}}
+    <div class="long-description empty">
+      <div class="long-description-inner">
         {{#if (can "manage project" project)}}
-          <button class="clear small" name="edit" {{action 'edit'}}>Edit description</button>
+          <div class="no-description user-can-add">
+            <h3>Add your project description.</h3>
+            <div class="box-icon"></div>
+            <p>Let's add some detailed information about your project:</p>
+            <ul>
+              <li>What do you hope to accomplish?</li>
+              <li>What real problem is this solving?</li>
+              <li>What kind of support will you need, both right now and in the future?</li>
+              <li>What risks and challenges will you face?</li>
+            </ul>
+          </div>
+        {{else}}
+          <div class="no-description user-cannot-add">
+            <h3>Nothing to see here!</h3>
+            <div class="box-icon"></div>
+            <p>Looks like this project is still getting set up!</p>
+          </div>
         {{/if}}
       </div>
-      {{{project.longDescriptionBody}}}
-    {{/unless}}
-  </div>
-{{/if}}
+    </div>
+  {{else}}
+    <div class="long-description">
+      {{#unless inEditMode}}
+        <div class="long-description-header">
+          <h3>About this project</h3>
+          {{#if (can "manage project" project)}}
+            <button class="clear small" name="edit" {{action 'edit'}}>Edit description</button>
+          {{/if}}
+        </div>
+        {{{project.longDescriptionBody}}}
+      {{/unless}}
+    </div>
+  {{/if}}
+{{/unless}}
 
 {{#if (can "manage project" project)}}
   {{#if shouldDisplayEditor}}
     <div class="long-description-editor">
       {{editor-with-preview input=project.longDescriptionMarkdown isLoading=project.isSaving modifiedSubmit="save"}}
-      <button class="default save" name="save" {{action 'save'}}>Save description</button>
+      {{log project.errors.longDescriptionMarkdown}}
+      {{#each project.errors.longDescriptionMarkdown as |error|}}
+        <p class="error">{{error.message}}</p>
+      {{/each}}
+      <div class="actions">
+        <button class="clear" name="cancel" {{action 'cancel'}}>Cancel</button>
+        <button class="default save" name="save" {{action 'save'}}>Save description</button>
+      </div>
     </div>
   {{/if}}
 {{/if}}
