diff --git a/Gemfile.lock b/Gemfile.lock
index 1311894..a2d1c15 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -28,7 +28,7 @@
 PATH
   remote: ../substance-rails
   specs:
-    substance-rails (1.0.1)
+    substance-rails (0.0.1)
       actionpack (>= 3.1)
       execjs (>= 2.2.2, >= 2.2)
       railties (>= 3.1)
diff --git a/app/views/dmptemplates/_show_question.html.erb b/app/views/dmptemplates/_show_question.html.erb
index df79c2b..03ee743 100644
--- a/app/views/dmptemplates/_show_question.html.erb
+++ b/app/views/dmptemplates/_show_question.html.erb
@@ -19,7 +19,7 @@
 			<td><%= raw question.text %>
 				</br>
 				<div class="answer-readonly">
-					<% q_format = question.question_format %>
+					<% q_format = question.question_format || QuestionFormat.first %>
 					<% if q_format.title == t("helpers.checkbox") || q_format.title == t("helpers.multi_select_box") || q_format.title == t("helpers.radio_buttons") || q_format.title == t("helpers.dropdown") then%>
 						<ul class='options'>
 						<% if question.options.is_a? Option then %>
diff --git a/app/views/plans/_answer_form.html.erb b/app/views/plans/_answer_form.html.erb
index 5f262ba..4d46505 100644
--- a/app/views/plans/_answer_form.html.erb
+++ b/app/views/plans/_answer_form.html.erb
@@ -112,7 +112,13 @@
                     <%= text_field_tag("answer-text-#{question.id}".to_sym, strip_tags(answer.text), class: "question_text_field") %>
                 <!--text area display-->
                 <% elsif q_format.title == t("helpers.text_area") then%>
-                    <%= text_area_tag("answer-text-#{question.id}".to_sym, answer.text, class: "tinymce") %>
+             
+                  <div id="answer-to-question-<%= question.id %>" 
+                       class="answer-textarea" 
+                       editable data-type="area">
+                    <p><%= answer.text.to_s %></p>
+                  </div>
+                  <input type="hidden" id="answer-text-<%= question.id %>" val="<%= answer.text %>" />
                 <% end %>
 
             <% end %>
@@ -122,7 +128,8 @@
                 <% if readonly then %>
                     <%= f.action :submit, :label => t("helpers.save"), :button_html => { :class => "btn btn-primary"}, :input_html => { :disabled => true } %>
                 <% else %>
-                    <%= f.action :submit, :label => t("helpers.save"), :button_html => { :class => "btn btn-primary"} %>
+										<input type="submit" class="btn btn-primary" onclick="_saveAnswer('<%= question.id %>', event);" value="<%= t('helpers.save') %>" />
+
                 <% end %>
                 <li id="saving-<%= question.id %>" class="saving-message" style="display:none;"><%= t("helpers.saving")%></li>
             <% end %>
diff --git a/db/schema.rb b/db/schema.rb
index ee4bbff..3ed50f7 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -14,445 +14,451 @@
 ActiveRecord::Schema.define(version: 20170110092511) do
 
   create_table "answers", force: :cascade do |t|
-    t.text     "text"
-    t.integer  "plan_id"
-    t.integer  "user_id"
-    t.integer  "question_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.text     "text",        limit: 65535
+    t.integer  "plan_id",     limit: 4
+    t.integer  "user_id",     limit: 4
+    t.integer  "question_id", limit: 4
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "answers_options", id: false, force: :cascade do |t|
-    t.integer "answer_id", null: false
-    t.integer "option_id", null: false
+    t.integer "answer_id", limit: 4, null: false
+    t.integer "option_id", limit: 4, null: false
   end
 
-  add_index "answers_options", ["answer_id", "option_id"], name: "index_answers_options_on_answer_id_and_option_id"
+  add_index "answers_options", ["answer_id", "option_id"], name: "index_answers_options_on_answer_id_and_option_id", using: :btree
 
   create_table "comments", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "question_id"
-    t.text     "text"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer  "user_id",     limit: 4
+    t.integer  "question_id", limit: 4
+    t.text     "text",        limit: 65535
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
     t.boolean  "archived"
-    t.integer  "plan_id"
-    t.integer  "archived_by"
+    t.integer  "plan_id",     limit: 4
+    t.integer  "archived_by", limit: 4
   end
 
   create_table "dmptemplates", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
+    t.string   "title",           limit: 255
+    t.text     "description",     limit: 65535
     t.boolean  "published"
-    t.integer  "user_id"
-    t.integer  "organisation_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "locale"
+    t.integer  "user_id",         limit: 4
+    t.integer  "organisation_id", limit: 4
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
+    t.string   "locale",          limit: 255
     t.boolean  "is_default"
   end
 
   create_table "dmptemplates_guidance_groups", id: false, force: :cascade do |t|
-    t.integer "dmptemplate_id"
-    t.integer "guidance_group_id"
+    t.integer "dmptemplate_id",    limit: 4
+    t.integer "guidance_group_id", limit: 4
   end
 
   create_table "exported_plans", force: :cascade do |t|
-    t.integer  "plan_id"
-    t.integer  "user_id"
-    t.string   "format"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer  "plan_id",    limit: 4
+    t.integer  "user_id",    limit: 4
+    t.string   "format",     limit: 255
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
   end
 
   create_table "file_types", force: :cascade do |t|
-    t.string   "name"
-    t.string   "icon_name"
-    t.integer  "icon_size"
-    t.string   "icon_location"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "name",          limit: 255
+    t.string   "icon_name",     limit: 255
+    t.integer  "icon_size",     limit: 4
+    t.string   "icon_location", limit: 255
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "file_uploads", force: :cascade do |t|
-    t.string   "name"
-    t.string   "title"
-    t.text     "description"
-    t.integer  "size"
+    t.string   "name",         limit: 255
+    t.string   "title",        limit: 255
+    t.text     "description",  limit: 65535
+    t.integer  "size",         limit: 4
     t.boolean  "published"
-    t.string   "location"
-    t.integer  "file_type_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "location",     limit: 255
+    t.integer  "file_type_id", limit: 4
+    t.datetime "created_at",                 null: false
+    t.datetime "updated_at",                 null: false
   end
 
   create_table "friendly_id_slugs", force: :cascade do |t|
-    t.string   "slug",                      null: false
-    t.integer  "sluggable_id",              null: false
+    t.string   "slug",           limit: 255, null: false
+    t.integer  "sluggable_id",   limit: 4,   null: false
     t.string   "sluggable_type", limit: 40
     t.datetime "created_at"
   end
 
-  add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true
-  add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id"
-  add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type"
+  add_index "friendly_id_slugs", ["slug", "sluggable_type"], name: "index_friendly_id_slugs_on_slug_and_sluggable_type", unique: true, using: :btree
+  add_index "friendly_id_slugs", ["sluggable_id"], name: "index_friendly_id_slugs_on_sluggable_id", using: :btree
+  add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type", using: :btree
 
   create_table "guidance_groups", force: :cascade do |t|
-    t.string   "name"
-    t.integer  "organisation_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "name",            limit: 255
+    t.integer  "organisation_id", limit: 4
+    t.datetime "created_at",                  null: false
+    t.datetime "updated_at",                  null: false
     t.boolean  "optional_subset"
     t.boolean  "published"
   end
 
   create_table "guidance_in_group", id: false, force: :cascade do |t|
-    t.integer "guidance_id",       null: false
-    t.integer "guidance_group_id", null: false
+    t.integer "guidance_id",       limit: 4, null: false
+    t.integer "guidance_group_id", limit: 4, null: false
   end
 
-  add_index "guidance_in_group", ["guidance_id", "guidance_group_id"], name: "index_guidance_in_group_on_guidance_id_and_guidance_group_id"
+  add_index "guidance_in_group", ["guidance_id", "guidance_group_id"], name: "index_guidance_in_group_on_guidance_id_and_guidance_group_id", using: :btree
 
   create_table "guidances", force: :cascade do |t|
-    t.text     "text"
-    t.integer  "guidance_group_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "question_id"
+    t.text     "text",              limit: 65535
+    t.integer  "guidance_group_id", limit: 4
+    t.datetime "created_at",                      null: false
+    t.datetime "updated_at",                      null: false
+    t.integer  "question_id",       limit: 4
     t.boolean  "published"
   end
 
   create_table "identifier_schemes", force: :cascade do |t|
-    t.string   "name"
-    t.string   "description"
+    t.string   "name",          limit: 255
+    t.string   "description",   limit: 255
     t.boolean  "active"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.boolean  "use_for_login",             default: false
   end
 
   create_table "languages", force: :cascade do |t|
-    t.string  "abbreviation"
-    t.string  "description"
-    t.string  "name"
+    t.string  "abbreviation",     limit: 255
+    t.string  "description",      limit: 255
+    t.string  "name",             limit: 255
     t.boolean "default_language"
   end
 
   create_table "option_warnings", force: :cascade do |t|
-    t.integer  "organisation_id"
-    t.integer  "option_id"
-    t.text     "text"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer  "organisation_id", limit: 4
+    t.integer  "option_id",       limit: 4
+    t.text     "text",            limit: 65535
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
   end
 
   create_table "options", force: :cascade do |t|
-    t.integer  "question_id"
-    t.string   "text"
-    t.integer  "number"
+    t.integer  "question_id", limit: 4
+    t.string   "text",        limit: 255
+    t.integer  "number",      limit: 4
     t.boolean  "is_default"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
   end
 
   create_table "org_token_permissions", force: :cascade do |t|
-    t.integer  "organisation_id"
-    t.integer  "token_permission_type_id"
+    t.integer  "organisation_id",          limit: 4
+    t.integer  "token_permission_type_id", limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "organisation_types", force: :cascade do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "name",        limit: 255
+    t.text     "description", limit: 65535
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "organisations", force: :cascade do |t|
-    t.string   "name"
-    t.string   "abbreviation"
-    t.string   "target_url"
-    t.integer  "organisation_type_id"
-    t.string   "domain"
-    t.string   "wayfless_entity"
-    t.integer  "stylesheet_file_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "parent_id"
+    t.string   "name",                 limit: 255
+    t.string   "abbreviation",         limit: 255
+    t.string   "target_url",           limit: 255
+    t.integer  "organisation_type_id", limit: 4
+    t.string   "domain",               limit: 255
+    t.string   "wayfless_entity",      limit: 255
+    t.integer  "stylesheet_file_id",   limit: 4
+    t.datetime "created_at",                         null: false
+    t.datetime "updated_at",                         null: false
+    t.integer  "parent_id",            limit: 4
     t.boolean  "is_other"
-    t.string   "sort_name"
-    t.text     "banner_text"
-    t.string   "logo_file_name"
-    t.integer  "region_id"
-    t.integer  "language_id"
-    t.string   "logo_uid"
-    t.string   "logo_name"
-    t.string   "contact_email"
+    t.string   "sort_name",            limit: 255
+    t.text     "banner_text",          limit: 65535
+    t.integer  "region_id",            limit: 4
+    t.integer  "language_id",          limit: 4
+    t.string   "logo_uid",             limit: 255
+    t.string   "logo_name",            limit: 255
+    t.string   "contact_email",        limit: 255
   end
 
   create_table "phases", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "number"
-    t.integer  "dmptemplate_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "slug"
+    t.string   "title",          limit: 255
+    t.text     "description",    limit: 65535
+    t.integer  "number",         limit: 4
+    t.integer  "dmptemplate_id", limit: 4
+    t.datetime "created_at",                   null: false
+    t.datetime "updated_at",                   null: false
+    t.string   "slug",           limit: 255
   end
 
-  add_index "phases", ["dmptemplate_id"], name: "index_phases_on_dmptemplate_id"
-  add_index "phases", ["slug"], name: "index_phases_on_slug", unique: true
+  add_index "phases", ["dmptemplate_id"], name: "index_phases_on_dmptemplate_id", using: :btree
+  add_index "phases", ["slug"], name: "index_phases_on_slug", unique: true, using: :btree
 
   create_table "plan_sections", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "section_id"
-    t.integer  "plan_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer  "user_id",      limit: 4
+    t.integer  "section_id",   limit: 4
+    t.integer  "plan_id",      limit: 4
+    t.datetime "created_at",             null: false
+    t.datetime "updated_at",             null: false
     t.datetime "release_time"
   end
 
   create_table "plans", force: :cascade do |t|
     t.boolean  "locked"
-    t.integer  "project_id"
-    t.integer  "version_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer  "project_id", limit: 4
+    t.integer  "version_id", limit: 4
+    t.datetime "created_at",           null: false
+    t.datetime "updated_at",           null: false
   end
 
   create_table "project_groups", force: :cascade do |t|
     t.boolean  "project_creator"
     t.boolean  "project_editor"
-    t.integer  "user_id"
-    t.integer  "project_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer  "user_id",               limit: 4
+    t.integer  "project_id",            limit: 4
+    t.datetime "created_at",                      null: false
+    t.datetime "updated_at",                      null: false
     t.boolean  "project_administrator"
   end
 
   create_table "project_guidance", id: false, force: :cascade do |t|
-    t.integer "project_id",        null: false
-    t.integer "guidance_group_id", null: false
+    t.integer "project_id",        limit: 4, null: false
+    t.integer "guidance_group_id", limit: 4, null: false
   end
 
-  add_index "project_guidance", ["project_id", "guidance_group_id"], name: "index_project_guidance_on_project_id_and_guidance_group_id"
+  add_index "project_guidance", ["project_id", "guidance_group_id"], name: "index_project_guidance_on_project_id_and_guidance_group_id", using: :btree
 
   create_table "projects", force: :cascade do |t|
-    t.string   "title"
-    t.integer  "dmptemplate_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "slug"
-    t.integer  "organisation_id"
-    t.string   "grant_number"
-    t.string   "identifier"
-    t.text     "description"
-    t.string   "principal_investigator"
-    t.string   "principal_investigator_identifier"
-    t.string   "data_contact"
-    t.string   "funder_name"
-    t.boolean  "is_test",                           default: false
-    t.integer  "visibility",                        default: 0
+    t.string   "title",                             limit: 255
+    t.integer  "dmptemplate_id",                    limit: 4
+    t.datetime "created_at",                                                      null: false
+    t.datetime "updated_at",                                                      null: false
+    t.string   "slug",                              limit: 255
+    t.integer  "organisation_id",                   limit: 4
+    t.string   "grant_number",                      limit: 255
+    t.string   "identifier",                        limit: 255
+    t.text     "description",                       limit: 65535
+    t.string   "principal_investigator",            limit: 255
+    t.string   "principal_investigator_identifier", limit: 255
+    t.string   "data_contact",                      limit: 255
+    t.string   "funder_name",                       limit: 255
+    t.boolean  "is_test",                                         default: false
+    t.boolean  "is_public",                                       default: false
+    t.integer  "visibility",                        limit: 4,     default: 0,     null: false
   end
 
-  add_index "projects", ["slug"], name: "index_projects_on_slug", unique: true
+  add_index "projects", ["id", "is_test", "is_public"], name: "index_projects_on_id_and_is_test_and_is_public", using: :btree
+  add_index "projects", ["slug"], name: "index_projects_on_slug", unique: true, using: :btree
 
   create_table "question_formats", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "title",       limit: 255
+    t.text     "description", limit: 65535
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "questions", force: :cascade do |t|
-    t.text     "text"
-    t.text     "default_value"
-    t.text     "guidance"
-    t.integer  "number"
-    t.integer  "parent_id"
-    t.integer  "dependency_id"
-    t.text     "dependency_text"
-    t.integer  "section_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "question_format_id"
-    t.boolean  "option_comment_display", default: true
+    t.text     "text",                   limit: 65535
+    t.text     "default_value",          limit: 65535
+    t.text     "guidance",               limit: 65535
+    t.integer  "number",                 limit: 4
+    t.integer  "parent_id",              limit: 4
+    t.integer  "dependency_id",          limit: 4
+    t.text     "dependency_text",        limit: 65535
+    t.integer  "section_id",             limit: 4
+    t.datetime "created_at",                                          null: false
+    t.datetime "updated_at",                                          null: false
+    t.integer  "question_format_id",     limit: 4
+    t.boolean  "option_comment_display",               default: true
   end
 
   create_table "questions_themes", id: false, force: :cascade do |t|
-    t.integer "question_id", null: false
-    t.integer "theme_id",    null: false
+    t.integer "question_id", limit: 4, null: false
+    t.integer "theme_id",    limit: 4, null: false
   end
 
-  add_index "questions_themes", ["question_id", "theme_id"], name: "index_questions_themes_on_question_id_and_theme_id"
+  add_index "questions_themes", ["question_id", "theme_id"], name: "index_questions_themes_on_question_id_and_theme_id", using: :btree
 
   create_table "region_groups", force: :cascade do |t|
-    t.integer "super_region_id"
-    t.integer "region_id"
+    t.integer "super_region_id", limit: 4
+    t.integer "region_id",       limit: 4
   end
 
   create_table "regions", force: :cascade do |t|
-    t.string "abbreviation"
-    t.string "description"
-    t.string "name"
+    t.string "abbreviation", limit: 255
+    t.string "description",  limit: 255
+    t.string "name",         limit: 255
   end
 
   create_table "roles", force: :cascade do |t|
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "name",          limit: 255
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
     t.boolean  "role_in_plans"
-    t.integer  "resource_id"
-    t.string   "resource_type"
+    t.integer  "resource_id",   limit: 4
+    t.string   "resource_type", limit: 255
   end
 
-  add_index "roles", ["name"], name: "index_roles_on_name"
-  add_index "roles", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id"
+  add_index "roles", ["name"], name: "index_roles_on_name", using: :btree
+  add_index "roles", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id", using: :btree
 
   create_table "sections", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "number"
-    t.integer  "version_id"
-    t.integer  "organisation_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "title",           limit: 255
+    t.text     "description",     limit: 65535
+    t.integer  "number",          limit: 4
+    t.integer  "version_id",      limit: 4
+    t.integer  "organisation_id", limit: 4
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
     t.boolean  "published"
   end
 
   create_table "settings", force: :cascade do |t|
-    t.string   "var",         null: false
-    t.text     "value"
-    t.integer  "target_id",   null: false
-    t.string   "target_type", null: false
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "var",         limit: 255,   null: false
+    t.text     "value",       limit: 65535
+    t.integer  "target_id",   limit: 4,     null: false
+    t.string   "target_type", limit: 255,   null: false
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
-  add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true
+  add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true, using: :btree
 
   create_table "splash_logs", force: :cascade do |t|
-    t.string   "destination"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "destination", limit: 255
+    t.datetime "created_at",              null: false
+    t.datetime "updated_at",              null: false
   end
 
   create_table "suggested_answers", force: :cascade do |t|
-    t.integer  "question_id"
-    t.integer  "organisation_id"
-    t.text     "text"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer  "question_id",     limit: 4
+    t.integer  "organisation_id", limit: 4
+    t.text     "text",            limit: 65535
+    t.datetime "created_at",                    null: false
+    t.datetime "updated_at",                    null: false
     t.boolean  "is_example"
   end
 
   create_table "themes", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "locale"
+    t.string   "title",       limit: 255
+    t.text     "description", limit: 65535
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
+    t.string   "locale",      limit: 255
   end
 
   create_table "themes_in_guidance", id: false, force: :cascade do |t|
-    t.integer "theme_id"
-    t.integer "guidance_id"
+    t.integer "theme_id",    limit: 4
+    t.integer "guidance_id", limit: 4
   end
 
   create_table "token_permission_types", force: :cascade do |t|
-    t.string   "token_type"
-    t.text     "text_description"
+    t.string   "token_type",       limit: 255
+    t.text     "text_description", limit: 65535
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "user_identifiers", force: :cascade do |t|
-    t.string   "identifier"
+    t.string   "identifier",           limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "user_id"
-    t.integer  "identifier_scheme_id"
+    t.integer  "user_id",              limit: 4
+    t.integer  "identifier_scheme_id", limit: 4
   end
 
+  add_index "user_identifiers", ["identifier_scheme_id"], name: "fk_rails_fe95df7db0", using: :btree
+  add_index "user_identifiers", ["user_id"], name: "fk_rails_65c9a98cdb", using: :btree
+
   create_table "user_role_types", force: :cascade do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "name",        limit: 255
+    t.text     "description", limit: 65535
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "user_statuses", force: :cascade do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "name",        limit: 255
+    t.text     "description", limit: 65535
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "user_types", force: :cascade do |t|
-    t.string   "name"
-    t.text     "description"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "name",        limit: 255
+    t.text     "description", limit: 65535
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
   create_table "users", force: :cascade do |t|
-    t.string   "firstname"
-    t.string   "surname"
-    t.string   "email",                  default: "", null: false
-    t.string   "orcid_id"
-    t.string   "shibboleth_id"
-    t.integer  "user_type_id"
-    t.integer  "user_status_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.string   "encrypted_password",     default: ""
-    t.string   "reset_password_token"
+    t.string   "firstname",              limit: 255
+    t.string   "surname",                limit: 255
+    t.string   "email",                  limit: 255, default: "", null: false
+    t.string   "orcid_id",               limit: 255
+    t.string   "shibboleth_id",          limit: 255
+    t.integer  "user_type_id",           limit: 4
+    t.integer  "user_status_id",         limit: 4
+    t.datetime "created_at",                                      null: false
+    t.datetime "updated_at",                                      null: false
+    t.string   "encrypted_password",     limit: 255, default: ""
+    t.string   "reset_password_token",   limit: 255
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0
+    t.integer  "sign_in_count",          limit: 4,   default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip"
-    t.string   "last_sign_in_ip"
-    t.string   "confirmation_token"
+    t.string   "current_sign_in_ip",     limit: 255
+    t.string   "last_sign_in_ip",        limit: 255
+    t.string   "confirmation_token",     limit: 255
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "invitation_token"
+    t.string   "invitation_token",       limit: 255
     t.datetime "invitation_created_at"
     t.datetime "invitation_sent_at"
     t.datetime "invitation_accepted_at"
-    t.string   "other_organisation"
-    t.boolean  "dmponline3"
+    t.string   "other_organisation",     limit: 255
     t.boolean  "accept_terms"
-    t.integer  "organisation_id"
-    t.string   "api_token"
-    t.integer  "invited_by_id"
-    t.string   "invited_by_type"
-    t.integer  "language_id"
+    t.integer  "organisation_id",        limit: 4
+    t.string   "api_token",              limit: 255
+    t.integer  "invited_by_id",          limit: 4
+    t.string   "invited_by_type",        limit: 255
+    t.integer  "language_id",            limit: 4
   end
 
-  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-  add_index "users", ["email"], name: "index_users_on_email", unique: true
-  add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
+  add_index "users", ["email"], name: "index_users_on_email", unique: true, using: :btree
+  add_index "users", ["invitation_token"], name: "index_users_on_invitation_token", unique: true, using: :btree
+  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
 
   create_table "users_roles", id: false, force: :cascade do |t|
-    t.integer "user_id"
-    t.integer "role_id"
+    t.integer "user_id", limit: 4
+    t.integer "role_id", limit: 4
   end
 
-  add_index "users_roles", ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id"
+  add_index "users_roles", ["user_id", "role_id"], name: "index_users_roles_on_user_id_and_role_id", using: :btree
 
   create_table "versions", force: :cascade do |t|
-    t.string   "title"
-    t.text     "description"
-    t.integer  "number"
-    t.integer  "phase_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string   "title",       limit: 255
+    t.text     "description", limit: 65535
     t.boolean  "published"
+    t.integer  "number",      limit: 4
+    t.integer  "phase_id",    limit: 4
+    t.datetime "created_at",                null: false
+    t.datetime "updated_at",                null: false
   end
 
-  add_index "versions", ["phase_id"], name: "index_versions_on_phase_id"
+  add_index "versions", ["phase_id"], name: "index_versions_on_phase_id", using: :btree
 
+  add_foreign_key "user_identifiers", "identifier_schemes"
+  add_foreign_key "user_identifiers", "users"
 end
diff --git a/lib/assets/javascripts/plans.js b/lib/assets/javascripts/plans.js
index 0cda411..9955406 100644
--- a/lib/assets/javascripts/plans.js
+++ b/lib/assets/javascripts/plans.js
@@ -530,7 +530,19 @@
        
 };
 
+/* SUBSTANCE EDITOR */
+/*------------------------------------------------*/
+function _saveAnswer(question, e){
 
+console.log('processing answer for question ' + question);
+
+	let forms = window.substanceForms;
+	let data = { answer: forms.getHTML('answer-to-question-' + question) };
+	
+console.log(data);
+	
+	$("#answer-text-" + question).val(data['answer']);
+}
 
 
 
diff --git a/lib/assets/stylesheets/application.css b/lib/assets/stylesheets/application.css
index 05afd6c..abda49c 100644
--- a/lib/assets/stylesheets/application.css
+++ b/lib/assets/stylesheets/application.css
@@ -12,7 +12,9 @@
  *= require_self
  *= require bootstrap_and_overrides
  *= require bootstrap.css
- *= require bootstrap_and_overrides.css.less
  *= require select2.css
  *= require substance-forms.css
- */
+ *= require substance/substance-reset.css
+ *= require font-awesome.min.css
+ *= require bootstrap_and_overrides.css.less
+ */
\ No newline at end of file
diff --git a/lib/assets/stylesheets/bootstrap_and_overrides.css.less b/lib/assets/stylesheets/bootstrap_and_overrides.css.less
index f6c099e..a1c25e4 100644
--- a/lib/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/lib/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -499,6 +499,12 @@
 }
 
 
+/**** Substance Editor ***/
+.sc-rich-text-area {
+	border: 1px solid #ddd;
+  padding: 20px 10px;
+  padding-bottom: 0px;
+}