diff --git a/app/controllers/plans_controller.rb b/app/controllers/plans_controller.rb
index 77c5256..0026bcf 100644
--- a/app/controllers/plans_controller.rb
+++ b/app/controllers/plans_controller.rb
@@ -115,7 +115,7 @@
     @plan = Plan.eager_load(params[:id])
     authorize @plan
 
-    @visibility = @plan.visibility.blank? ? @plan.visibility.to_s : Rails.application.config.default_plan_visibility
+    @visibility = @plan.visibility.present? ? @plan.visibility.to_s : Rails.application.config.default_plan_visibility
 
     @editing = (!params[:editing].nil? && @plan.administerable_by?(current_user.id))
 
@@ -156,7 +156,7 @@
     @plan = Plan.find(params[:id])
     authorize @plan
     
-    @visibility = @plan.visibility.blank? ? @plan.visibility.to_s : Rails.application.config.default_plan_visibility
+    @visibility = @plan.visibility.present? ? @plan.visibility.to_s : Rails.application.config.default_plan_visibility
     
     # If there was no phase specified use the template's 1st phase
     @phase = (params[:phase].nil? ? @plan.template.phases.first : Phase.find(params[:phase]))
@@ -195,9 +195,7 @@
   def update
     @plan = Plan.find(params[:id])
     authorize @plan
-
     attrs = plan_params
-    attrs['visibility'] = Rails.application.config.default_plan_visibility if plan_params['visibility'].blank?
 
     respond_to do |format|
       if @plan.update_attributes(attrs)
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index a99407f..3fa1d39 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -8,8 +8,9 @@
   def admin_index
     authorize User
     # Sets the user to the currently logged in user if it is undefined
-    @user = current_user if @user.nil?
-    @users = @user.org.users.includes(:roles)
+#    @user = current_user if @user.nil?
+#    @users = @user.org.users.includes(:roles)
+    @users = current_user.org.users.includes(:roles)
   end
 
   ##
@@ -19,20 +20,20 @@
   def admin_grant_permissions
     @user = User.includes(:perms).find(params[:id])
     authorize @user
-    user_perms = @user.perms
+    user_perms = current_user.perms
     @perms = user_perms & [Perm.grant_permissions, Perm.modify_templates, Perm.modify_guidance, Perm.use_api, Perm.change_org_details]
   end
 
   ##
   # POST - updates the permissions for a user
   # redirects to the admin_index action
-  # should add validation that the perms given are current perms of the @user
+  # should add validation that the perms given are current perms of the current_user
   def admin_update_permissions
     @user = User.includes(:perms).find(params[:id])
     authorize @user
     perms_ids = params[:perm_ids].blank? ? [] : params[:perm_ids].map(&:to_i)
     perms = Perm.where( id: perms_ids)
-    @user.perms.each do |perm|
+    current_user.perms.each do |perm|
       if @user.perms.include? perm
         if ! perms.include? perm
           @user.perms.delete(perm)
diff --git a/app/models/answer.rb b/app/models/answer.rb
index ddce6f7..f44987b 100644
--- a/app/models/answer.rb
+++ b/app/models/answer.rb
@@ -44,6 +44,9 @@
   # @return [Answer] the saved, copied answer
   def self.deep_copy(answer)
     answer_copy = answer.dup
+    answer.question_options.each do |opt|
+      answer_copy.question_options << opt
+    end
     answer_copy.save!
     return answer_copy
   end
diff --git a/app/models/plan.rb b/app/models/plan.rb
index 3abf98e..ab84aca 100644
--- a/app/models/plan.rb
+++ b/app/models/plan.rb
@@ -32,7 +32,8 @@
                   :exported_plans, :project, :title, :template, :grant_number,
                   :identifier, :principal_investigator, :principal_investigator_identifier,
                   :description, :data_contact, :funder_name, :visibility, :exported_plans,
-                  :roles, :users, :org, :as => [:default, :admin]
+                  :roles, :users, :org, :data_contact_email, :data_contact_phone,
+                  :as => [:default, :admin]
   accepts_nested_attributes_for :roles
 
   # public is a Ruby keyword so using publicly
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index 3c922a6..9b1139d 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -6,13 +6,13 @@
   <div class="tabbed-area">
     <ul class="tabs" role="tablist">
       <li id="personal-details-tab" class="active" role="tab" aria-controls="personal-details-panel">
-        <a href="#personal-details-panel" aria-selected="true">Personal Details</a>
+        <a href="#personal-details-panel" aria-selected="true"><%= _('Personal Details') %></a>
       </li>
       <li id="password-details-tab" role="tab" aria-controls="password-details-panel">
-        <a href="#password-details-panel" aria-selected="false">Password</a>
+        <a href="#password-details-panel" aria-selected="false"><%= _('Password') %></a>
       </li>
       <li id="notification-preferences-tab" role="tab" aria-controls="notification-preferences-panel">
-        <a href="#notification-preferences-panel" aria-selected="false">Notification Preferences</a>
+        <a href="#notification-preferences-panel" aria-selected="false"><%= _('Notification Preferences') %></a>
       </li>
     </ul>
     
diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb
index b610abf..1d4dc80 100644
--- a/app/views/guidances/admin_index.html.erb
+++ b/app/views/guidances/admin_index.html.erb
@@ -75,7 +75,7 @@
   <% if @guidances.length > 0 then%>
     <table class="dmp_table tablesorter">
       <thead>
-        <% if @guidances.count > 10 %>
+        <% if @guidances.length > 10 %>
           <tr>
             <td colspan="5" class="td-as-th">
               <%= render(partial: "shared/table_filter", 
diff --git a/app/views/orgs/shibboleth_ds.html.erb b/app/views/orgs/shibboleth_ds.html.erb
index c3e2f6a..7484fdd 100644
--- a/app/views/orgs/shibboleth_ds.html.erb
+++ b/app/views/orgs/shibboleth_ds.html.erb
@@ -10,7 +10,7 @@
           <%= _('Look up your institution here') %>
         </label>
     
-        <% if @orgs.count <= 10 %>
+        <% if @orgs.length <= 10 %>
           <select id="org_name" class="left-indent">
             <option value=""><%= _('Please select one') %></option>
             <%= raw @orgs.collect{|o| "<option value=\"#{o.id}\">#{o.name}</option>" }.join('') %>
@@ -34,7 +34,7 @@
                             tooltip: _('Select an institution.'),
                             classes: 'inline left-indent'} %>
 
-        <% if @orgs.count > 10 %>
+        <% if @orgs.length > 10 %>
           <p class="centered left-indent">
             <strong>- <%= _('or') %> -</strong>
             <br />
@@ -49,7 +49,7 @@
   <div id="full_list" style="display: none" class="left-indent" aria-hidden="true">
     <div id="org-list">
 			<%
-      increment, cols, letter, total, row = 50, 1, '', @orgs.count, 0
+      increment, cols, letter, total, row = 50, 1, '', @orgs.length, 0
 
       # Determine how many letter separators 
       total += @orgs.collect{|o| o.name[0]}.uniq.count
diff --git a/app/views/phases/_answer_form.html.erb b/app/views/phases/_answer_form.html.erb
index 8c151f3..7272631 100644
--- a/app/views/phases/_answer_form.html.erb
+++ b/app/views/phases/_answer_form.html.erb
@@ -48,7 +48,7 @@
       <% active_tab = 'note_tab' %>
       <% end %>
       <li class="note_tab <%= "active" if active_tab == 'note_tab' %>" role="tab" aria-controls="comment-question-area-<%= question.id %>">
-        <% if comments.count > 0 %>
+        <% if comments.length > 0 %>
           <a href="#comment-question-area-<%= question.id %>" id="notes_number_<%= question.id %>" aria-selected="<%= active_tab == 'note_tab' %>"><%= _('Notes') %></a>
         <% else %>
           <a href="#comment-question-area-<%= question.id %>" id="notes_number_<%= question.id %>" aria-selected="<%= active_tab == 'note_tab' %>"><%= _(' Share note') %></a>
diff --git a/lib/tasks/migrate.rake b/lib/tasks/migrate.rake
index f436586..0625b3c 100644
--- a/lib/tasks/migrate.rake
+++ b/lib/tasks/migrate.rake
@@ -1,4 +1,17 @@
 namespace :migrate do
+
+  desc "migrate to 0.4" 
+  task to_04: :environment do
+    # Default all plans.visibility to the value specified in application.rb
+    Rake::Task['migrate:init_plan_visibility'].execute
+    # Move old plans.data_contact to plans.data_contact_email if value is an email
+    Rake::Task['migrate:plan_data_contacts'].execute
+    # Move users.orcid_id to the user_identifiers table
+    Rake::Task['migrate:move_orcids'].execute
+    # Move users.shibboleth_id to the user_identifiers table
+    Rake::Task['migrate:move_shibs'].execute
+  end
+
   desc "TODO"
   task permissions: :environment do
     User.update_user_permissions
@@ -214,29 +227,6 @@
 
   end
 
-  desc "move old ORCID from user table to user_identifiers"
-  task move_orcids: :environment do
-    if IdentifierScheme.find_by(name: 'orcid').nil?
-      IdentifierScheme.create!(name: 'orcid', description: 'ORCID', active: true)
-    end
-    
-    scheme = IdentifierScheme.find_by(name: 'orcid')
-      
-    unless scheme.nil?
-      User.all.each do |u|
-        if u.respond_to?(:orcid_id)
-          if u.orcid_id.present? 
-            if u.orcid_id.gsub('orcid.org/', '').match(/^[\d-]+/)
-              u.user_identifiers << UserIdentifier.new(identifier_scheme: scheme, 
-                                                       identifier: u.orcid_id.gsub('orcid.org/', ''))
-              u.save!
-            end
-          end
-        end
-      end
-    end
-  end
-
   desc "enforce single published version for templates"
   task single_published_template: :environment do
     # for each group of versions of a template
@@ -253,5 +243,97 @@
       end
     end
   end
+
+# Tasks required to migrate to 0.4.x
+# -----------------------------------------------
+  desc "Initialize plans.visibility to the default specified in application.rb"
+  task init_plan_visibility: :environment do
+    default = Rails.configuration.default_plan_visibility.to_sym
+    Plan.all.each{ |p| p.update_attributes(visibility: default) unless p.visibility == default }
+  end
+
+  desc "Move old plans.data_contact to data_contact_email and data_contact_phone"
+  task plan_data_contacts: :environment do
+    email_regex = /([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})/i
+    phone_regex = /\+?[0-9\-\(\)]{7,}/i
+    Plan.where('data_contact IS NOT NULL').each do |p|
+      email = p.data_contact[email_regex]
+      phone = p.data_contact[phone_regex]
+
+      # Remove the email, phone and any prefixes from the oriignal contact
+      contact = p.data_contact
+      contact = contact.gsub(email, '') unless email.nil?
+      contact = contact.gsub(phone, '') unless phone.nil?
+      contact = contact.gsub(/([Ee]mail|[Pp]hone|[Mm]obile|[Cc]ell|[Oo]ffice|[Hh]ome|[Ww]ork|[Tt]|[Ee]):?/, '')
+      contact = contact.gsub(' , ', '').strip
+      contact = contact[0..(contact.length - 2)] if contact.ends_with?(',')
+      contact = nil if contact == ','
+      
+      p.update_attributes(data_contact_email: email, data_contact_phone: phone, 
+                          data_contact: contact)
+    end
+  end
+
+  desc "Move old ORCID from users table to user_identifiers"
+  task move_orcids: :environment do
+    users = User.includes(:user_identifiers).where('users.orcid_id IS NOT NULL')
+    
+    # If we have users with orcid ids
+    if users.length > 0
+      # If orcid isn't defined in the identifier_schemes table add it
+      if IdentifierScheme.find_by(name: 'orcid').nil?
+        IdentifierScheme.create!(name: 'orcid', 
+                                 description: 'ORCID', 
+                                 active: true,
+                                 logo_url: 'http://orcid.org/sites/default/files/images/orcid_16x16.png',
+                                 user_landing_url: 'https://orcid.org')
+      end
+    
+      scheme = IdentifierScheme.find_by(name: 'orcid')
+      
+      unless scheme.nil?
+        users.each do |u|
+          if u.orcid_id.gsub('orcid.org/', '').match(/^[\d-]+/)
+            schemes = u.user_identifiers.collect{|i| i.identifier_scheme_id}
+            
+            unless schemes.include?(scheme.id)
+              UserIdentifier.create(user: u, identifier_scheme: scheme,
+                                    identifier: u.orcid_id.gsub('orcid.org/', ''))
+            end
+          end
+        end
+      end
+    end
+  end
   
+  desc "Move old Shibboleth Ids from users table to user_identifiers"
+  task move_shibs: :environment do
+    if Rails.configuration.shibboleth_enabled
+      users = User.includes(:user_identifiers).where('users.shibboleth_id IS NOT NULL')
+    
+      # If we have users with orcid ids
+      if users.length > 0
+        # If orcid isn't defined in the identifier_schemes table add it
+        if IdentifierScheme.find_by(name: 'shibboleth').nil?
+          IdentifierScheme.create!(name: 'shibboleth', 
+                                   description: "Your institution credentials", 
+                                   active: true)
+        end
+    
+        scheme = IdentifierScheme.find_by(name: 'shibboleth')
+      
+        unless scheme.nil?
+          users.each do |u|
+            schemes = u.user_identifiers.collect{|i| i.identifier_scheme_id}
+            
+            unless schemes.include?(scheme.id)
+# TODO: Add logic to move shib identifiers over
+#              UserIdentifier.create(user: u, identifier_scheme: scheme,
+#                                    identifier: u.orcid_id.gsub('orcid.org/', ''))
+            end
+          end
+        end
+      end
+    end
+  end
 end
diff --git a/test/unit/answer_test.rb b/test/unit/answer_test.rb
index 0f63562..198f9a8 100644
--- a/test/unit/answer_test.rb
+++ b/test/unit/answer_test.rb
@@ -113,6 +113,23 @@
   end
   
   # ---------------------------------------------------
+  test "can copy an Answer" do
+    qf = QuestionFormat.where(option_based: true).first
+    q = @plan.template.questions.select{|q| q.question_format == qf }.first
+    
+    assert_not q.nil?, "expected the test template to have a question of type: #{qf.title}"
+    answr = Answer.create(user: @user, plan: @plan, question: q, question_options: [q.question_options.first])
+    
+    copy = Answer.deep_copy(answr)
+    
+    assert_equal answr.text, copy.text, "expected the answer text to be the same"
+    assert_equal answr.question.id, copy.question.id, "expected the question to be the same"
+    answr.question_options.each do |opt|
+      assert copy.question_options.include?(opt), "expected the copy to have question options"
+    end
+  end
+  
+  # ---------------------------------------------------
   test "can manage belongs_to relationship with User" do
     verify_belongs_to_relationship(@answer, User.last)
   end