diff --git a/app/controllers/annotations_controller.rb b/app/controllers/annotations_controller.rb
index e83366b..73a34fb 100644
--- a/app/controllers/annotations_controller.rb
+++ b/app/controllers/annotations_controller.rb
@@ -16,6 +16,7 @@
     # if they dont exist, no requirement for them to be saved
     ex_save = example_answer.present? ? example_answer.save : true
     guid_save = guidance.present? ? guidance.save : true
+    @question.section.phase.template.dirty = true
 
     if ex_save && guid_save
       redirect_to admin_show_phase_path(id: @question.section.phase_id, section_id: @question.section_id, question_id: @question.id, edit: 'true'), notice: _('Information was successfully created.')
@@ -73,6 +74,8 @@
 
     @section = @question.section
     @phase = @section.phase
+    @phase.template.dirty = true
+
     if ex_save && guid_save
       redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, question_id: @question.id, edit: 'true'), notice: _('Information was successfully updated.')
     else
@@ -95,6 +98,7 @@
     @question = @example_answer.question
     @section = @question.section
     @phase = @section.phase
+    @phase.template.dirty = true
     if @example_answer.destroy
       redirect_to admin_show_phase_path(id: @phase.id, section_id: @section.id, edit: 'true'), notice: _('Information was successfully deleted.')
     else
@@ -113,4 +117,4 @@
     return annotation
   end
 
-end
\ No newline at end of file
+end
diff --git a/app/controllers/phases_controller.rb b/app/controllers/phases_controller.rb
index 21084a9..82633c7 100644
--- a/app/controllers/phases_controller.rb
+++ b/app/controllers/phases_controller.rb
@@ -7,12 +7,12 @@
     # GET /plans/:plan_id/phases/:id/edit
     def edit
 
-    @plan = Plan.eager_load2(params[:plan_id])
+    @plan = Plan.load_for_phase(params[:plan_id], params[:id])
     # authorization done on plan so found in plan_policy
     authorize @plan
 
     phase_id = params[:id].to_i
-    @phase = @plan.template.phases.select {|p| p.id == phase_id}.first
+    @phase = @plan.template.phases.first
     @readonly = !@plan.editable_by?(current_user.id)
 
     # Now we need to get all the themed guidance for the plan.
@@ -46,35 +46,35 @@
       end
     end
 
-    # create hash from question id to theme to guidance array
-    # so when we arerendering a question we can grab the guidance out of this
-    #
-    # question_guidance = {
-    #              question.id => {
-    #                      theme => [ {text: "......", org: "....."} ]
-    #              }
-    # }
+    questions = []
+    # Appends all the questions for a given phase into questions Array.
+    @phase.sections.each do |section|
+      section.questions.each do |question|
+        questions.push(question)
+      end
+    end
     @question_guidance = {}
-    @plan.questions.each do |question|
+    # Puts in question_guidance (key/value) entries where key is the question id and value is a hash.
+    # Each question id hash has (key/value) entries where key is a theme and value is an Array of {text, org} objects
+    # Example hash
+    # question_guidance = { question.id => 
+    #                         { theme => [ {text: "......", org: "....."} ] }
+    #                     } 
+    questions.each do |question|
       qg = {}
       question.themes.each do |t|
         title = t.title
         qg[title] = theme_guidance[title] if theme_guidance.has_key?(title)
       end
-      if !@question_guidance.has_key?(question.id)
-        @question_guidance[question.id] = Array.new
-      end
       @question_guidance[question.id] = qg
     end
 
     if !user_signed_in? then
       respond_to do |format|
                 format.html { redirect_to edit_user_registration_path }
-            end
-        end
-
+      end
     end
-
+  end
 
     # GET /plans/PLANID/phases/PHASEID/status.json
   def status
diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index f7edc1f..2c4d8c6 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -370,10 +370,10 @@
   def template_options(org_id, funder_id)
     @templates = []
 
-    if !org_id.blank? || !funder_id.blank?
+    if org_id.present? || funder_id.present?
       if funder_id.blank?
         # Load the org's template(s)
-        unless org_id.nil?
+        if org_id.present?
           org = Org.find(org_id)
           @templates = Template.valid.where(published: true, org: org, customization_of: nil).to_a
           @msg = _("We found multiple DMP templates corresponding to the research organisation.") if @templates.count > 1
@@ -384,20 +384,20 @@
         # Load the funder's template(s)
         @templates = Template.valid.where(published: true, org: funder).to_a
 
-        unless org_id.blank?
+        if org_id.present?
           org = Org.find(org_id)
 
           # Swap out any organisational cusotmizations of a funder template
           @templates.each do |tmplt|
             customization = Template.valid.find_by(published: true, org: org, customization_of: tmplt.dmptemplate_id)
-            unless customization.nil?
+            if customization.present? && tmplt.updated_at < customization.created_at
               @templates.delete(tmplt)
               @templates << customization
             end
           end
         end
 
-        msg = _("We found multiple DMP templates corresponding to the funder.") if @templates.count > 1
+        @msg = _("We found multiple DMP templates corresponding to the funder.") if @templates.count > 1
       end
     end
 
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 3a50d54..ad2b69b 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -8,21 +8,22 @@
     authorize @role
     access_level = params[:role][:access_level].to_i
     set_access_level(access_level)
+    message = ''
     if params[:user].present?
       if @role.plan.owner.present? && @role.plan.owner.email == params[:user]
         flash[:notice] = _('Cannot share plan with %{email} since that email matches with the owner of the plan.') % {email: params[:user]}
       else
-        if Role.find_by(plan: @role.plan, user: User.find_by(email: params[:user])) # role already exists
+        user = User.where_case_insensitive('email',params[:user]).first
+        if Role.find_by(plan: @role.plan, user: user) # role already exists
           flash[:notice] = _('Plan is already shared with %{email}.') % {email: params[:user]}
-        else  
-          message = _('Plan shared with %{email}.') % {email: params[:user]}
-          user = User.find_by(email: params[:user])
+        else
           if user.nil?
             registered = false
             User.invite!(email: params[:user])
-            message = _('Invitation to %{email} issued successfully.') % {email: params[:user]}
+            message = _('Invitation to %{email} issued successfully. \n') % {email: params[:user]}
             user = User.find_by(email: params[:user])
           end
+          message += _('Plan shared with %{email}.') % {email: user.email}
           @role.user = user
           if @role.save
             if registered then UserMailer.sharing_notification(@role, current_user).deliver_now end
diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
index 42eb4ee..2717fef 100644
--- a/app/controllers/templates_controller.rb
+++ b/app/controllers/templates_controller.rb
@@ -55,6 +55,7 @@
       random = rand 2147483647
       break random unless Template.exists?(dmptemplate_id: random)
     end
+    customisation.dirty = true
     customisation.save
 
     customisation.phases.includes(:sections, :questions).each do |phase|
diff --git a/app/models/plan.rb b/app/models/plan.rb
index 8688f34..b32f3f6 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -990,16 +990,15 @@
       ]).find(id)
   end
 
-  def self.eager_load2(id)
+  def self.load_for_phase(id, phase_id)
     Plan.includes(
-      [{template: [
+      [template: [
                    {phases: {sections: {questions: [{answers: :notes}, :annotations, :question_format, :themes]}}},
                    {customizations: :org},
                    :org
-                  ]},
-       {plans_guidance_groups: {guidance_group: {guidances: :themes}}},
-       {questions: :themes}
-      ]).find(id)
+                  ],
+       plans_guidance_groups: {guidance_group: {guidances: :themes}}
+      ]).where(id: id, phases: { id: phase_id }).first
   end
 
 
diff --git a/app/models/settings/template.rb b/app/models/settings/template.rb
index 59ac3de..a9fd6f8 100644
--- a/app/models/settings/template.rb
+++ b/app/models/settings/template.rb
@@ -1,11 +1,11 @@
 module Settings
   class Template < RailsSettings::SettingObject
-  
+
   #attr_accessible :var, :target, :target_id, :target_type
 
     VALID_FONT_FACES = [
-      'Arial, Helvetica, Sans-Serif',
-      '"Times New Roman", Times, Serif'
+      '"Times New Roman", Times, Serif',
+      'Arial, Helvetica, Sans-Serif'
     ]
 
     VALID_FONT_SIZE_RANGE = (8..14)
@@ -17,13 +17,13 @@
     DEFAULT_SETTINGS = {
       formatting: {
         margin: { # in millimeters
-          top:    20,
-          bottom: 20,
-          left:   20,
-          right:  20
+          top:    10,
+          bottom: 10,
+          left:   10,
+          right:  10
         },
         font_face: VALID_FONT_FACES.first,
-        font_size: 12 # pt
+        font_size: 10 # pt
       },
       max_pages: 3,
       fields: {
diff --git a/app/models/user.rb b/app/models/user.rb
index f900030..f35abe3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -6,8 +6,8 @@
   #   Include default devise modules. Others available are:
   #   :token_authenticatable, :confirmable,
   #   :lockable, :timeoutable and :omniauthable
-  devise :invitable, :database_authenticatable, :registerable, :recoverable, 
-         :rememberable, :trackable, :validatable, :omniauthable, 
+  devise :invitable, :database_authenticatable, :registerable, :recoverable,
+         :rememberable, :trackable, :validatable, :omniauthable,
          :omniauth_providers => [:shibboleth, :orcid]
 
   ##
@@ -26,14 +26,14 @@
       q = "%#{query}%"
       conditions = t[:title].matches(q)
       columns = %i(
-        grant_number identifier description principal_investigator data_contact 
+        grant_number identifier description principal_investigator data_contact
       )
       columns = ['grant_number', 'identifier', 'description', 'principal_investigator', 'data_contact']
       columns.each {|col| conditions = conditions.or(t[col].matches(q)) }
       self.where(conditions)
     end
   end
-  
+
   has_many :user_identifiers
   has_many :identifier_schemes, through: :user_identifiers
 
@@ -41,12 +41,12 @@
   # Possibly needed for active_admin
   #   -relies on protected_attributes gem as syntax depricated in rails 4.2
   #accepts_nested_attributes_for :roles
-  #attr_accessible :password_confirmation, :encrypted_password, :remember_me, 
-  #                :id, :email, :firstname, :last_login,:login_count, :orcid_id, 
-  #                :password, :shibboleth_id, :user_status_id, :surname, 
-  #                :user_type_id, :org_id, :skip_invitation, :other_organisation, 
+  #attr_accessible :password_confirmation, :encrypted_password, :remember_me,
+  #                :id, :email, :firstname, :last_login,:login_count, :orcid_id,
+  #                :password, :shibboleth_id, :user_status_id, :surname,
+  #                :user_type_id, :org_id, :skip_invitation, :other_organisation,
   #                :accept_terms, :role_ids, :dmponline3, :api_token,
-  #                :organisation, :language, :language_id, :org, :perms, 
+  #                :organisation, :language, :language_id, :org, :perms,
   #                :confirmed_at, :org_id
 
   validates :email, email: true, allow_nil: true, uniqueness: {message: _("must be unique")}
@@ -62,13 +62,13 @@
   # What do they do? do they do it efficiently, and do we need them?
 
   # Determines the locale set for the user or the organisation he/she belongs
-  # @return String or nil 
+  # @return String or nil
   def get_locale
     if !self.language.nil?
       return self.language.abbreviation
     elsif !self.org.nil?
       return self.org.get_locale
-    else 
+    else
       return nil
     end
   end
@@ -126,7 +126,7 @@
   def organisation=(new_org)
     org_id = new_org.id unless new_org.nil?
   end
-  
+
   ##
   # checks if the user is a super admin
   # if the user has any privelege which requires them to see the super admin page
@@ -144,7 +144,7 @@
   #
   # @return [Boolean] true if the user is an organisation admin
   def can_org_admin?
-    return self.can_grant_permissions? || self.can_modify_guidance? || 
+    return self.can_grant_permissions? || self.can_modify_guidance? ||
            self.can_modify_templates? || self.can_modify_org_details?
   end
 
@@ -223,7 +223,7 @@
     return org_type
   end
 =end
-  
+
   ##
   # removes the api_token from the user
   # modifies the user model
@@ -254,11 +254,11 @@
   # --------------------------------------------------------------
   def self.from_omniauth(auth)
     scheme = IdentifierScheme.find_by(name: auth.provider.downcase)
-    
+
     if scheme.nil?
       throw Exception.new('Unknown OAuth provider: ' + auth.provider)
     else
-      joins(:user_identifiers).where('user_identifiers.identifier': auth.uid, 
+      joins(:user_identifiers).where('user_identifiers.identifier': auth.uid,
                    'user_identifiers.identifier_scheme_id': scheme.id).first
     end
   end
@@ -269,7 +269,14 @@
   def deliver_invitation(options = {})
     super(options.merge(subject: _('A Data Management Plan in %{application_name} has been shared with you') % {application_name: Rails.configuration.branding[:application][:name]}))
   end
-
+  ##
+  # Case insensitive search over User model
+  # @param field [string] The name of the field being queried
+  # @param val [string] The string to search for, case insensitive
+  # @return [ActiveRecord::Relation] The result of the search
+  def self.where_case_insensitive(field, val)
+    User.where("lower(#{field}) = ?", val.downcase)
+  end
 
 # TODO: Remove this, its never called.
   # this generates a reset password link for a given user
@@ -278,12 +285,12 @@
 =begin
   def reset_password_link
     raw, enc = Devise.token_generator.generate(self.class, :reset_password_token)
-    self.reset_password_token   = enc 
+    self.reset_password_token   = enc
     self.reset_password_sent_at = Time.now.utc
     save(validate: false)
 
     edit_user_password_path  + '?reset_password_token=' + raw
   end
 =end
-  
+
 end
diff --git a/app/views/templates/admin_index.html.erb b/app/views/templates/admin_index.html.erb
index 2acb25a..7532bec 100644
--- a/app/views/templates/admin_index.html.erb
+++ b/app/views/templates/admin_index.html.erb
@@ -46,10 +46,10 @@
             <td class="dmp_td_small">
               <% if hash[:live].nil? %>
 								<%= _('Unpublished') %>
-								
+
               <% elsif hash[:current].dirty? %>
                 <%= _('Unpublished changes') %>
-								
+
 							<% else %>
 								<%= _('Published') %>
               <% end %>
@@ -58,7 +58,7 @@
             	<% last_temp_updated = hash[:current].updated_at %>
            	 	<%= l last_temp_updated.to_date, formats: :short %>
           	</td>
-						
+
             <td class="dmp_td_small">
             	<%= link_to _('Edit'), admin_template_template_path(id: hash[:current].id, edit: "true"), class: "dmp_table_link" %>
             	<%= link_to _('History'), admin_template_history_template_path(id: hash[:current].id), class: "dmp_table_link" %>
@@ -119,7 +119,7 @@
 								<% elsif hash[:live].nil? %>
 									<!-- The template does not have a live version -->
 									<%= b_label = _('Un-published') %>
-								<% elsif !hash[:current].published? %>
+								<% elsif hash[:current].dirty? %>
 									<%= _('You have un-published changes') %>
 								<% else %>
 									<%= _('Published') %>
@@ -142,14 +142,14 @@
                   <% b_label = _('Edit customisation') %>
                   <%= link_to b_label, admin_template_template_path(hash[:current]), class: "dmp_table_link" %>
                 <% end %>
-                
+
               <% end %>
 
-							<% if !hash[:current].customization_of.nil? %>
+							<% if !hash[:current].customization_of.nil? && !hash[:stale] %>
 								<% if hash[:live].nil? || hash[:current].dirty? %>
 									<%= link_to _('Publish'), admin_publish_template_path(hash[:current]), method: :put, class: "dmp_table_link" %>
 								<% end %>
-								<% if !hash[:live].nil? %>
+								<% if hash[:live].present? %>
 									<%= link_to _('Unpublish'), admin_unpublish_template_path(hash[:current]), method: :put, class: "dmp_table_link" %>
 								<% end %>
 							<% end %>
diff --git a/db/migrate/20170702012742_ensure_indexes_in_place.rb b/db/migrate/20170702012742_ensure_indexes_in_place.rb
index 6bd9410..367ce5f 100644
--- a/db/migrate/20170702012742_ensure_indexes_in_place.rb
+++ b/db/migrate/20170702012742_ensure_indexes_in_place.rb
@@ -1,8 +1,12 @@
 class EnsureIndexesInPlace < ActiveRecord::Migration
   def change
     #users_perms
+    remove_foreign_key :users_perms, :perms
+    remove_foreign_key :users_perms, :users
     remove_index :users_perms, name: 'index_users_perms_on_user_id_and_perm_id'
     add_index :users_perms, :user_id
+    add_foreign_key :users_perms, :perms
+    add_foreign_key :users_perms, :users
     #user_identifiers
     add_index :user_identifiers, :user_id
     #roles
@@ -27,14 +31,22 @@
     #annotations
     add_index :annotations, :question_id
     #question_themes
+    remove_foreign_key :questions_themes, :questions
+    remove_foreign_key :questions_themes, :themes
     remove_index :questions_themes, name: 'question_theme_index'
     remove_index :questions_themes, name: 'theme_question_index'
     add_index :questions_themes, :question_id
+    add_foreign_key :questions_themes, :questions
+    add_foreign_key :questions_themes, :themes
     #question_options
     add_index :question_options, :question_id
     #answers_question_options
+    remove_foreign_key :answers_question_options, :answers
+    remove_foreign_key :answers_question_options, :question_options
     remove_index :answers_question_options, name: 'answer_question_option_index'
     remove_index :answers_question_options, name: 'question_option_answer_index'
     add_index :answers_question_options, :answer_id
+    add_foreign_key :answers_question_options, :answers
+    add_foreign_key :answers_question_options, :question_options
   end
 end
diff --git a/db/seeds.rb b/db/seeds.rb
index 6c4aded..fabb9a8 100644
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -8,7 +8,7 @@
   {name: 'orcid', description: 'ORCID', active: true, 
    logo_url:'http://orcid.org/sites/default/files/images/orcid_16x16.png', 
    user_landing_url:'https://orcid.org' },
-  {name: 'shibboleth', description: 'your institutional credentials', active: true,
+  {name: 'shibboleth', description: 'Your institutional credentials', active: true,
   },
 ]
 identifier_schemes.map{ |is| IdentifierScheme.create!(is) if IdentifierScheme.find_by(name: is[:name]).nil? }
@@ -16,13 +16,13 @@
 # Question Formats
 # -------------------------------------------------------
 question_formats = [
-  {title: "Text area", option_based: false},
-  {title: "Text field", option_based: false},
-  {title: "Radio buttons", option_based: true},
-  {title: "Check box", option_based: true},
-  {title: "Dropdown", option_based: true},
-  {title: "Multi select box", option_based: true},
-  {title: "Date", option_based: false}
+  {title: "Text area", option_based: false, formattype: 0},
+  {title: "Text field", option_based: false, formattype: 1},
+  {title: "Radio buttons", option_based: true, formattype: 2},
+  {title: "Check box", option_based: true, formattype: 3},
+  {title: "Dropdown", option_based: true, formattype: 4},
+  {title: "Multi select box", option_based: true, formattype: 5},
+  {title: "Date", option_based: true, formattype: 6}
 ]
 question_formats.map{ |qf| QuestionFormat.create!(qf) if QuestionFormat.find_by(title: qf[:title]).nil? }
 
@@ -154,7 +154,9 @@
 # -------------------------------------------------------
 token_permission_types = [
   {token_type: 'guidances', text_description: 'allows a user access to the guidances api endpoint'},
-  {token_type: 'plans', text_description: 'allows a user access to the plans api endpoint'}
+  {token_type: 'plans', text_description: 'allows a user access to the plans api endpoint'},
+  {token_type: 'templates', text_description: 'allows a user access to the templates api endpoint'},
+  {token_type: 'statistics', text_description: 'allows a user access to the statistics api endpoint'}
 ]
 token_permission_types.map{ |tpt| TokenPermissionType.create!(tpt) if TokenPermissionType.find_by(token_type: tpt[:token_type]).nil? }
 
diff --git a/lib/tasks/bugfix.rake b/lib/tasks/bugfix.rake
new file mode 100644
index 0000000..5fc6bf1
--- /dev/null
+++ b/lib/tasks/bugfix.rake
@@ -0,0 +1,49 @@
+namespace :bugfix do
+
+  desc "Bug fixes for version v0.3.3"
+  task v0_3_3: :environment do
+    Rake::Task['bugfix:fix_question_formats'].execute
+    Rake::Task['bugfix:add_missing_token_permission_types'].execute
+  end
+
+  desc "Add the missing formattype to the question_formats table"
+  task fix_question_formats: :environment do
+    QuestionFormat.all.each do |qf|
+      case qf.title.downcase
+      when 'text area'
+        qf.formattype = :textarea
+      when 'text field'
+        qf.formattype = :textfield
+      when 'radio buttons'
+        qf.formattype = :radiobuttons
+      when 'check box'
+        qf.formattype = :checkbox
+      when 'dropdown'
+        qf.formattype = :dropdown
+      when 'multi select box'
+        qf.formattype = :multiselectbox
+      when 'date'
+        qf.formattype = :date
+      end
+      
+      qf.save!
+    end
+    
+    if QuestionFormat.find_by(formattype: :date).nil?
+      QuestionFormat.create!({title: "Date", option_based: true, formattype: 6})
+    end
+  end
+
+  desc "Add the missing token_permission_types"
+  task add_missing_token_permission_types: :environment do
+    if TokenPermissionType.find_by(token_type: 'templates').nil?
+      TokenPermissionType.create!({token_type: 'templates', 
+                                   text_description: 'allows a user access to the templates api endpoint'})
+    end
+    if TokenPermissionType.find_by(token_type: 'statistics').nil?
+      TokenPermissionType.create!({token_type: 'statistics', 
+                                   text_description: 'allows a user access to the statistics api endpoint'})
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake
index 7bfa27e..f070809 100644
--- a/lib/tasks/migrate.rake
+++ b/lib/tasks/migrate.rake
@@ -258,8 +258,11 @@
   task remove_duplicate_annotations: :environment do
     questions = Question.joins(:annotations).group("questions.id").having("count(annotations.id) > count(DISTINCT annotations.text)")
     questions.each do |q|
+      # store already de-duplicated id's so we dont remove them in later iterations
+      removed = []
       q.annotations.each do |a|
-        conflicts = Annotation.where(question_id: a.question_id, text: a.text).where.not(id: a.id)
+        removed << a.id
+        conflicts = Annotation.where(question_id: a.question_id, text: a.text).where.not(id: removed)
         conflicts.each {|c| c.destroy }
       end
     end
diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
index 7937867..9f2d7ce 100644
--- a/test/functional/roles_controller_test.rb
+++ b/test/functional/roles_controller_test.rb
@@ -7,10 +7,10 @@
   setup do
     scaffold_plan
     scaffold_org_admin(@plan.template.org)
-    
+
     # This should NOT be unnecessary! Owner should have full access
     @plan.roles << Role.create(user: @user, plan: @plan, access: 15)
-    
+
   end
 
 # TODO: Cleanup routes for this one. The controller currently only responds to create, update, destroy
@@ -21,19 +21,19 @@
 #   role    PATCH    /roles/:id     roles#update
 #           PUT      /roles/:id     roles#update
 #           DELETE   /roles/:id     roles#destroy
-  
+
 # POST /roles (roles_path)
   # ----------------------------------------------------------
   test "create a new role" do
 
     params = {plan_id: @plan.id, access_level: 4}
-    
+
     # Should redirect user to the root path if they are not logged in!
     post roles_path, {role: params}
     assert_unauthorized_redirect_to_root_path
 
     sign_in @user
-    
+
     # Known user
     @invitee = User.where.not(id: [@plan.owner.id, @user.id]).first
     post roles_path, {user: @invitee.email, role: params}
@@ -50,15 +50,15 @@
     assert_redirected_to share_plan_path(@plan)
     assert_equal @invitee.id, Role.last.user_id, "expected no record to have been created!"
     assert assigns(:role)
-            
+
     # Unknown user
     post roles_path, {user: 'unknown_user@org.org', role: params}
-    assert_equal _('Invitation to unknown_user@org.org issued successfully.'), flash[:notice]
+    assert_equal _('Invitation to unknown_user@org.org issued successfully. \nPlan shared with unknown_user@org.org.'), flash[:notice]
     assert_response :redirect
     assert_redirected_to share_plan_path(@plan)
     assert_equal User.find_by(email:'unknown_user@org.org').id, Role.last.user_id, "expected the record to have been created!"
     assert assigns(:role)
-        
+
     # Invite owner
     @invitee = User.find_by(id: @plan.owner.id)
     post roles_path, {user: @invitee.email, role: params}
@@ -67,26 +67,26 @@
     assert_redirected_to share_plan_path(@plan)
     assert_not_equal @invitee.id, Role.last.user_id, "expected no record to have been created!"
     assert assigns(:role)
-        
+
     # Missing email
     post roles_path, {role: {plan_id: @plan.id, access_level: 4}}
     assert_equal _('Please enter an email address'), flash[:notice]
     assert_response :redirect
     assert_redirected_to share_plan_path(@plan)
     assert assigns(:role)
-  end 
-  
+  end
+
   # PUT /role/:id (role_path)
   # ----------------------------------------------------------
   test "update the role" do
     @invitee = User.last
     role = Role.create(user: @invitee, plan: @plan, access: 1)
     params = {access_level: 2}
-    
+
     # Should redirect user to the root path if they are not logged in!
     put role_path(role), {role: params}
     assert_unauthorized_redirect_to_root_path
-    
+
     sign_in @user
 
     # Valid save
@@ -96,7 +96,7 @@
     assert_redirected_to share_plan_path(@plan)
     assert assigns(:role)
     assert_equal 13, role.reload.access, "expected the record to have been updated"
-    
+
 # TODO: Role should require a user, plan and an access level :/
     # Invalid save
 #    put role_path(role), {role: {user: nil}}
@@ -105,26 +105,26 @@
 #    assert_redirected_to share_plan_path(@plan)
 #    assert assigns(:role)
   end
-  
+
   # DELETE /role/:id (role_path)
   # ----------------------------------------------------------
   test "delete the section" do
     @invitee = User.last
     role = Role.create(user: @invitee, plan: @plan, access: 1)
-    
+
     # Should redirect user to the root path if they are not logged in!
     delete role_path(role)
     assert_unauthorized_redirect_to_root_path
-    
+
     sign_in @user
-    
+
     delete role_path(role)
     assert_equal _('Access removed'), flash[:notice]
     assert_response :redirect
     assert_redirected_to share_plan_path(@plan)
-    assert_raise ActiveRecord::RecordNotFound do 
+    assert_raise ActiveRecord::RecordNotFound do
       Role.find(role.id).nil?
     end
   end
-  
+
 end
diff --git a/test/functional/templates_controller_test.rb b/test/functional/templates_controller_test.rb
index 0987259..78a4724 100644
--- a/test/functional/templates_controller_test.rb
+++ b/test/functional/templates_controller_test.rb
@@ -238,7 +238,7 @@
 
     assert_equal 0, customization.version
     assert_not customization.published?
-    assert_not customization.dirty?
+    assert customization.dirty?
 
     # Make sure the funder templates data is not modifiable!
     customization.phases.each do |p|