diff --git a/README.md b/README.md
index 8546911..5b8e5c7 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,10 @@
 
 >     > rake db:seed
 
+* Setup the devise authentication gem
+
+>     > rails generate devise:install     (Is this really necessary?)
+
 * Start the application
 
 >     > rails server
diff --git a/app/models/user.rb b/app/models/user.rb
index 6bc0b55..ac18380 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,8 +3,8 @@
 	# Include default devise modules. Others available are:
 	# :token_authenticatable, :confirmable,
 	# :lockable, :timeoutable and :omniauthable
-	devise :invitable, :database_authenticatable, :registerable,
-		 :recoverable, :rememberable, :trackable, :validatable, :confirmable, :omniauthable, :omniauth_providers => [:shibboleth]
+	devise :invitable, :database_authenticatable, :registerable, :recoverable, :rememberable, 
+         :trackable, :validatable, :confirmable, :omniauthable, :omniauth_providers => [:shibboleth]
 
     #associations between tables
     belongs_to :user_type
@@ -40,10 +40,10 @@
     accepts_nested_attributes_for :roles
     #attr_accessible :role_ids
 
-    #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, :organisation_id, :skip_invitation, :other_organisation, :accept_terms, :role_ids, :dmponline3
-
-    # Added to allow the profile update form to update the fields displayed to the user
-    attr_accessible :email, :firstname, :surname, :orcid_id, :organisation_id, :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, :organisation_id, :skip_invitation, 
+                    :other_organisation, :accept_terms, :role_ids, :dmponline3
 
     # FIXME: The duplication in the block is to set defaults. It might be better if
     #        they could be set in Settings::PlanList itself, if possible.
diff --git a/app/views/static_pages/about_us.html.erb b/app/views/static_pages/about_us.html.erb
index 5f18a6c..9c9fd5a 100644
--- a/app/views/static_pages/about_us.html.erb
+++ b/app/views/static_pages/about_us.html.erb
@@ -4,6 +4,10 @@
 	  hash && $('ul.nav a[href="' + hash + '"]').tab('show');
 	
 	  $('.nav-tabs a').click(function (e) {
+
+// TODO: .nav-tabs a is not specific enough. This is interfering with top nav bar functionality
+			console.log("This: " + $(this).attr('href'));
+			
 	    $(this).tab('show');
 	    var scrollmem = $('body').scrollTop();
 	    window.location.hash = this.hash;