diff --git a/db/schema.rb b/db/schema.rb
index bb5acc9..27e10c2 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -14,10 +14,10 @@
 ActiveRecord::Schema.define(version: 20180212124444) do
 
   create_table "annotations", force: :cascade do |t|
-    t.integer  "question_id", limit: 4
-    t.integer  "org_id",      limit: 4
-    t.text     "text",        limit: 65535
-    t.integer  "type",        limit: 4,     default: 0, null: false
+    t.integer  "question_id"
+    t.integer  "org_id"
+    t.text     "text"
+    t.integer  "type",            default: 0, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -27,14 +27,14 @@
   add_index "annotations", ["question_id"], name: "index_annotations_on_question_id"
 
   create_table "answers", force: :cascade do |t|
-    t.text     "text",         limit: 65535
-    t.integer  "plan_id",      limit: 4
-    t.integer  "user_id",      limit: 4
-    t.integer  "question_id",  limit: 4
+    t.text     "text"
+    t.integer  "plan_id"
+    t.integer  "user_id"
+    t.integer  "question_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "lock_version", limit: 4,     default: 0
-    t.string   "label_id",     limit: 255
+    t.integer  "lock_version",     default: 0
+    t.string   "label_id"
   end
 
   add_index "answers", ["plan_id"], name: "fk_rails_84a6005a3e"
@@ -42,46 +42,46 @@
   add_index "answers", ["user_id"], name: "fk_rails_584be190c2"
 
   create_table "answers_question_options", id: false, force: :cascade do |t|
-    t.integer "answer_id",          limit: 4, null: false
-    t.integer "question_option_id", limit: 4, null: false
+    t.integer "answer_id", null: false
+    t.integer "question_option_id", null: false
   end
 
   add_index "answers_question_options", ["answer_id"], name: "index_answers_question_options_on_answer_id"
 
   create_table "exported_plans", force: :cascade do |t|
-    t.integer  "plan_id",    limit: 4
-    t.integer  "user_id",    limit: 4
-    t.string   "format",     limit: 255
+    t.integer  "plan_id"
+    t.integer  "user_id"
+    t.string   "format"
     t.datetime "created_at",             null: false
     t.datetime "updated_at",             null: false
-    t.integer  "phase_id",   limit: 4
+    t.integer  "phase_id"
   end
 
   create_table "file_types", force: :cascade do |t|
-    t.string   "name",          limit: 255
-    t.string   "icon_name",     limit: 255
-    t.integer  "icon_size",     limit: 4
-    t.string   "icon_location", limit: 255
+    t.string   "name"
+    t.string   "icon_name"
+    t.integer  "icon_size"
+    t.string   "icon_location"
     t.datetime "created_at",                null: false
     t.datetime "updated_at",                null: false
   end
 
   create_table "file_uploads", force: :cascade do |t|
-    t.string   "name",         limit: 255
-    t.string   "title",        limit: 255
-    t.text     "description",  limit: 65535
-    t.integer  "size",         limit: 4
+    t.string   "name"
+    t.string   "title"
+    t.text     "description"
+    t.integer  "size"
     t.boolean  "published"
-    t.string   "location",     limit: 255
-    t.integer  "file_type_id", limit: 4
+    t.string   "location"
+    t.integer  "file_type_id"
     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",           limit: 255, null: false
-    t.integer  "sluggable_id",   limit: 4,   null: false
-    t.string   "sluggable_type", limit: 40
+    t.string   "slug",           null: false
+    t.integer  "sluggable_id",   null: false
+    t.string   "sluggable_type"
     t.datetime "created_at"
   end
 
@@ -90,8 +90,8 @@
   add_index "friendly_id_slugs", ["sluggable_type"], name: "index_friendly_id_slugs_on_sluggable_type"
 
   create_table "guidance_groups", force: :cascade do |t|
-    t.string   "name",            limit: 255
-    t.integer  "org_id",          limit: 4
+    t.string   "name"
+    t.integer  "org_id"
     t.datetime "created_at",                  null: false
     t.datetime "updated_at",                  null: false
     t.boolean  "optional_subset"
@@ -102,11 +102,11 @@
   add_index "guidance_groups", ["org_id"], name: "index_guidance_groups_on_org_id"
 
   create_table "guidances", force: :cascade do |t|
-    t.text     "text",              limit: 65535
-    t.integer  "guidance_group_id", limit: 4
+    t.text     "text"
+    t.integer  "guidance_group_id"
     t.datetime "created_at",                      null: false
     t.datetime "updated_at",                      null: false
-    t.integer  "question_id",       limit: 4
+    t.integer  "question_id"
     t.boolean  "published"
   end
 
@@ -114,28 +114,28 @@
   add_index "guidances", ["guidance_group_id"], name: "index_guidances_on_guidance_group_id"
 
   create_table "identifier_schemes", force: :cascade do |t|
-    t.string   "name",             limit: 255
-    t.string   "description",      limit: 255
+    t.string   "name"
+    t.string   "description"
     t.boolean  "active"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.text     "logo_url",         limit: 255
-    t.text     "user_landing_url", limit: 255
+    t.text     "logo_url"
+    t.text     "user_landing_url"
   end
 
   create_table "languages", force: :cascade do |t|
-    t.string  "abbreviation",     limit: 255
-    t.string  "description",      limit: 255
-    t.string  "name",             limit: 255
+    t.string  "abbreviation"
+    t.string  "description"
+    t.string  "name"
     t.boolean "default_language"
   end
 
   create_table "notes", force: :cascade do |t|
-    t.integer  "user_id",     limit: 4
-    t.text     "text",        limit: 65535
+    t.integer  "user_id"
+    t.text     "text"
     t.boolean  "archived"
-    t.integer  "answer_id",   limit: 4
-    t.integer  "archived_by", limit: 4
+    t.integer  "answer_id"
+    t.integer  "archived_by"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -145,20 +145,20 @@
   add_index "notes", ["user_id"], name: "fk_rails_7f2323ad43"
 
   create_table "org_identifiers", force: :cascade do |t|
-    t.string   "identifier",           limit: 255
-    t.string   "attrs",                limit: 255
+    t.string   "identifier"
+    t.string   "attrs"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "org_id",               limit: 4
-    t.integer  "identifier_scheme_id", limit: 4
+    t.integer  "org_id"
+    t.integer  "identifier_scheme_id"
   end
 
   add_index "org_identifiers", ["identifier_scheme_id"], name: "fk_rails_189ad2e573"
   add_index "org_identifiers", ["org_id"], name: "fk_rails_36323c0674"
 
   create_table "org_token_permissions", force: :cascade do |t|
-    t.integer  "org_id",                   limit: 4
-    t.integer  "token_permission_type_id", limit: 4
+    t.integer  "org_id"
+    t.integer  "token_permission_type_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -168,35 +168,35 @@
   add_index "org_token_permissions", ["token_permission_type_id"], name: "fk_rails_2aa265f538"
 
   create_table "orgs", force: :cascade do |t|
-    t.string   "name",                   limit: 255
-    t.string   "abbreviation",           limit: 255
-    t.string   "target_url",             limit: 255
-    t.string   "wayfless_entity",        limit: 255
-    t.datetime "created_at",                                           null: false
-    t.datetime "updated_at",                                           null: false
-    t.integer  "parent_id",              limit: 4
+    t.string   "name"
+    t.string   "abbreviation"
+    t.string   "target_url"
+    t.string   "wayfless_entity"
+    t.datetime "created_at",                                  null: false
+    t.datetime "updated_at",                                  null: false
+    t.integer  "parent_id"
     t.boolean  "is_other"
-    t.string   "sort_name",              limit: 255
-    t.text     "banner_text",            limit: 65535
-    t.string   "logo_file_name",         limit: 255
-    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
-    t.integer  "org_type",               limit: 4,     default: 0,     null: false
-    t.string   "contact_name",           limit: 255
-    t.text     "links",                  limit: 255,   default: "[]"
-    t.boolean  "feedback_enabled",                     default: false
-    t.string   "feedback_email_subject", limit: 255
-    t.text     "feedback_email_msg",     limit: 65535
+    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.integer  "org_type",                    default: 0,     null: false
+    t.string   "contact_name"
+    t.text     "links",                       default: "[]"
+    t.boolean  "feedback_enabled",            default: false
+    t.string   "feedback_email_subject"
+    t.text     "feedback_email_msg"
   end
 
   add_index "orgs", ["language_id"], name: "fk_rails_5640112cab"
   add_index "orgs", ["region_id"], name: "fk_rails_5a6adf6bab"
 
   create_table "perms", force: :cascade do |t|
-    t.string   "name",       limit: 255
+    t.string   "name"
     t.datetime "created_at",             null: false
     t.datetime "updated_at",             null: false
   end
@@ -205,36 +205,36 @@
   add_index "perms", ["name"], name: "index_roles_on_name_and_resource_type_and_resource_id"
 
   create_table "phases", force: :cascade do |t|
-    t.string   "title",       limit: 255
-    t.text     "description", limit: 65535
-    t.integer  "number",      limit: 4
-    t.integer  "template_id", limit: 4
+    t.string   "title"
+    t.text     "description"
+    t.integer  "number"
+    t.integer  "template_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "slug",        limit: 255
+    t.string   "slug"
     t.boolean  "modifiable"
   end
 
   add_index "phases", ["template_id"], name: "index_phases_on_template_id"
 
   create_table "plans", force: :cascade do |t|
-    t.string   "title",                             limit: 255
-    t.integer  "template_id",                       limit: 4
+    t.string   "title"
+    t.integer  "template_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "slug",                              limit: 255
-    t.string   "data_contact_phone",                limit: 255
-    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.integer  "visibility",                        limit: 4,                     null: false
-    t.string   "data_contact_email",                limit: 255
-    t.string   "principal_investigator_email",      limit: 255
-    t.string   "principal_investigator_phone",      limit: 255
+    t.string   "slug"
+    t.string   "data_contact_phone"
+    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.integer  "visibility",                     null: false
+    t.string   "data_contact_email"
+    t.string   "principal_investigator_email"
+    t.string   "principal_investigator_phone"
     t.boolean  "feedback_requested",                              default: false
     t.boolean  "complete",                                        default: false
   end
@@ -242,40 +242,40 @@
   add_index "plans", ["template_id"], name: "index_plans_on_template_id"
 
   create_table "plans_guidance_groups", force: :cascade do |t|
-    t.integer "guidance_group_id", limit: 4
-    t.integer "plan_id",           limit: 4
+    t.integer "guidance_group_id"
+    t.integer "plan_id"
   end
 
   add_index "plans_guidance_groups", ["guidance_group_id"], name: "fk_rails_ec1c5524d7"
   add_index "plans_guidance_groups", ["plan_id"], name: "fk_rails_13d0671430"
 
   create_table "prefs", force: :cascade do |t|
-    t.text    "settings", limit: 65535
-    t.integer "user_id",  limit: 4
+    t.text    "settings"
+    t.integer "user_id"
   end
 
   create_table "question_format_labels", id: false, force: :cascade do |t|
-    t.integer  "id",          limit: 4
-    t.string   "description", limit: 255
-    t.integer  "question_id", limit: 4
-    t.integer  "number",      limit: 4
+    t.integer  "id"
+    t.string   "description"
+    t.integer  "question_id"
+    t.integer  "number"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "question_formats", force: :cascade do |t|
-    t.string   "title",        limit: 255
-    t.text     "description",  limit: 65535
+    t.string   "title"
+    t.text     "description"
     t.datetime "created_at",                                 null: false
     t.datetime "updated_at",                                 null: false
     t.boolean  "option_based",               default: false
-    t.integer  "formattype",   limit: 4,     default: 0
+    t.integer  "formattype",     default: 0
   end
 
   create_table "question_options", force: :cascade do |t|
-    t.integer  "question_id", limit: 4
-    t.string   "text",        limit: 255
-    t.integer  "number",      limit: 4
+    t.integer  "question_id"
+    t.string   "text"
+    t.integer  "number"
     t.boolean  "is_default"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -285,13 +285,13 @@
   add_index "question_options", ["question_id"], name: "index_question_options_on_question_id"
 
   create_table "questions", force: :cascade do |t|
-    t.text     "text",                   limit: 65535
-    t.text     "default_value",          limit: 65535
-    t.integer  "number",                 limit: 4
-    t.integer  "section_id",             limit: 4
+    t.text     "text"
+    t.text     "default_value"
+    t.integer  "number"
+    t.integer  "section_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "question_format_id",     limit: 4
+    t.integer  "question_format_id"
     t.boolean  "option_comment_display",               default: true
     t.boolean  "modifiable"
   end
@@ -300,25 +300,25 @@
   add_index "questions", ["section_id"], name: "index_questions_on_section_id"
 
   create_table "questions_themes", id: false, force: :cascade do |t|
-    t.integer "question_id", limit: 4, null: false
-    t.integer "theme_id",    limit: 4, null: false
+    t.integer "question_id", null: false
+    t.integer "theme_id", null: false
   end
 
   add_index "questions_themes", ["question_id"], name: "index_questions_themes_on_question_id"
 
   create_table "regions", force: :cascade do |t|
-    t.string  "abbreviation",    limit: 255
-    t.string  "description",     limit: 255
-    t.string  "name",            limit: 255
-    t.integer "super_region_id", limit: 4
+    t.string  "abbreviation"
+    t.string  "description"
+    t.string  "name"
+    t.integer "super_region_id"
   end
 
   create_table "roles", force: :cascade do |t|
-    t.integer  "user_id",    limit: 4
-    t.integer  "plan_id",    limit: 4
+    t.integer  "user_id"
+    t.integer  "plan_id"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "access",     limit: 4, default: 0,    null: false
+    t.integer  "access", default: 0,    null: false
     t.boolean  "active",               default: true
   end
 
@@ -328,32 +328,32 @@
   add_index "roles", ["user_id"], name: "index_roles_on_user_id"
 
   create_table "sample_plans", id: false, force: :cascade do |t|
-    t.integer  "id",          limit: 4
-    t.string   "url",         limit: 255
-    t.string   "label",       limit: 255
-    t.integer  "template_id", limit: 4
+    t.integer  "id"
+    t.string   "url"
+    t.string   "label"
+    t.integer  "template_id"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "sections", force: :cascade do |t|
-    t.string   "title",       limit: 255
-    t.text     "description", limit: 65535
-    t.integer  "number",      limit: 4
+    t.string   "title"
+    t.text     "description"
+    t.integer  "number"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "published"
-    t.integer  "phase_id",    limit: 4
+    t.integer  "phase_id"
     t.boolean  "modifiable"
   end
 
   add_index "sections", ["phase_id"], name: "index_sections_on_phase_id"
 
   create_table "settings", force: :cascade do |t|
-    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.string   "var",                       null: false
+    t.text     "value"
+    t.integer  "target_id",                 null: false
+    t.string   "target_type",               null: false
     t.datetime "created_at",                null: false
     t.datetime "updated_at",                null: false
   end
@@ -361,43 +361,43 @@
   add_index "settings", ["target_type", "target_id", "var"], name: "index_settings_on_target_type_and_target_id_and_var", unique: true
 
   create_table "splash_logs", force: :cascade do |t|
-    t.string   "destination", limit: 255
+    t.string   "destination"
     t.datetime "created_at",              null: false
     t.datetime "updated_at",              null: false
   end
 
   create_table "templates", force: :cascade do |t|
-    t.string   "title",            limit: 255
-    t.text     "description",      limit: 65535
+    t.string   "title"
+    t.text     "description"
     t.boolean  "published"
-    t.integer  "org_id",           limit: 4
-    t.string   "locale",           limit: 255
+    t.integer  "org_id"
+    t.string   "locale"
     t.boolean  "is_default"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "version",          limit: 4
-    t.integer  "visibility",       limit: 4
-    t.integer  "customization_of", limit: 4
-    t.integer  "dmptemplate_id",   limit: 4
+    t.integer  "version"
+    t.integer  "visibility"
+    t.integer  "customization_of"
+    t.integer  "dmptemplate_id"
     t.boolean  "migrated"
     t.boolean  "dirty",                          default: false
-    t.text     "links",            limit: 255,   default: "{\"funder\":[], \"sample_plan\":[]}"
+    t.text     "links",                          default: "{\"funder\":[], \"sample_plan\":[]}"
   end
 
   add_index "templates", ["org_id", "dmptemplate_id"], name: "template_organisation_dmptemplate_index"
   add_index "templates", ["org_id"], name: "index_templates_on_org_id"
 
   create_table "themes", force: :cascade do |t|
-    t.string   "title",       limit: 255
-    t.text     "description", limit: 65535
+    t.string   "title"
+    t.text     "description"
     t.datetime "created_at",                null: false
     t.datetime "updated_at",                null: false
-    t.string   "locale",      limit: 255
+    t.string   "locale"
   end
 
   create_table "themes_in_guidance", id: false, force: :cascade do |t|
-    t.integer "theme_id",    limit: 4
-    t.integer "guidance_id", limit: 4
+    t.integer "theme_id"
+    t.integer "guidance_id"
   end
 
   add_index "themes_in_guidance", ["guidance_id"], name: "fk_rails_a5ab9402df"
@@ -406,18 +406,18 @@
   add_index "themes_in_guidance", ["theme_id"], name: "index_themes_in_guidance_on_theme_id"
 
   create_table "token_permission_types", force: :cascade do |t|
-    t.string   "token_type",       limit: 255
-    t.text     "text_description", limit: 65535
+    t.string   "token_type"
+    t.text     "text_description"
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   create_table "user_identifiers", force: :cascade do |t|
-    t.string   "identifier",           limit: 255
+    t.string   "identifier"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "user_id",              limit: 4
-    t.integer  "identifier_scheme_id", limit: 4
+    t.integer  "user_id"
+    t.integer  "identifier_scheme_id"
   end
 
   add_index "user_identifiers", ["identifier_scheme_id"], name: "fk_rails_fe95df7db0"
@@ -436,26 +436,26 @@
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          limit: 4,   default: 0
+    t.integer  "sign_in_count",          default: 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
-    t.string   "current_sign_in_ip",     limit: 255
-    t.string   "last_sign_in_ip",        limit: 255
-    t.string   "confirmation_token",     limit: 255
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.string   "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "invitation_token",       limit: 255
+    t.string   "invitation_token"
     t.datetime "invitation_created_at"
     t.datetime "invitation_sent_at"
     t.datetime "invitation_accepted_at"
-    t.string   "other_organisation",     limit: 255
+    t.string   "other_organisation"
     t.boolean  "accept_terms"
-    t.integer  "org_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
-    t.string   "recovery_email",         limit: 255
+    t.integer  "org_id"
+    t.string   "api_token"
+    t.integer  "invited_by_id"
+    t.string   "invited_by_type"
+    t.integer  "language_id"
+    t.string   "recovery_email"
   end
 
   add_index "users", ["email"], name: "index_users_on_email", unique: true
@@ -464,8 +464,8 @@
   add_index "users", ["org_id"], name: "index_users_on_org_id"
 
   create_table "users_perms", id: false, force: :cascade do |t|
-    t.integer "user_id", limit: 4
-    t.integer "perm_id", limit: 4
+    t.integer "user_id"
+    t.integer "perm_id"
   end
 
   add_index "users_perms", ["perm_id"], name: "fk_rails_457217c31c"