diff --git a/app/helpers/preferences_helper.rb b/app/helpers/preferences_helper.rb
index 4dd9330e..fb1f189e 100644
--- a/app/helpers/preferences_helper.rb
+++ b/app/helpers/preferences_helper.rb
@@ -1,9 +1,10 @@
 module PreferencesHelper
 
   def pref(model, pref_name, &block)
-    s = "<label for #{model+pref_name}>#{Preference.human_attribute_name(pref_name)}:</label><br/>"
+    s = content_tag(:label, Preference.human_attribute_name(pref_name), :for => model+pref_name)
+    s << "<br/>".html_safe
     s << yield
-    s << "<br/><br/>"
+    s << "<br/><br/>".html_safe
     s
   end
 
diff --git a/app/models/preference.rb b/app/models/preference.rb
index 2a51e542..d730acc9 100644
--- a/app/models/preference.rb
+++ b/app/models/preference.rb
@@ -3,8 +3,10 @@ class Preference < ActiveRecord::Base
   belongs_to :sms_context, :class_name => 'Context'
 
   attr_accessible :date_format, :week_starts, :show_number_completed, :show_completed_projects_in_sidebar,
-    :show_hidden_contexts_in_sidebar, :staleness_starts, :due_style, :admin_email, :locale
-  
+    :show_hidden_contexts_in_sidebar, :staleness_starts, :due_style, :admin_email, :locale,
+    :title_date_format, :time_zone, :show_hidden_projects_in_sidebar, :show_project_on_todo_done, :review_period,
+    :refresh, :verbose_action_descriptors, :mobile_todos_per_page, :sms_email, :sms_context_id
+    
   def self.due_styles
     { :due_in_n_days => 0, :due_on => 1}
   end
diff --git a/app/views/preferences/index.html.erb b/app/views/preferences/index.html.erb
index c97e0801..67a1f553 100644
--- a/app/views/preferences/index.html.erb
+++ b/app/views/preferences/index.html.erb
@@ -1,23 +1,11 @@
 <div id="display_box">
 
   <div id="edit_error_status">
-    <% if @user.errors.any? -%>
-      <ul>
-        <% @user.errors.full_messages.each do |msg| %>
-          <li><%= msg %></li>
-        <% end %>
-      </ul>
-    <% end -%>
-    <% if @prefs.errors.any? -%>
-      <ul>
-        <% @prefs.errors.full_messages.each do |msg| %>
-          <li><%= msg %></li>
-        <% end %>
-      </ul>
-    <% end -%>
+    <%= get_list_of_error_messages_for(@user)%>
+    <%= get_list_of_error_messages_for(@prefs)%>
   </div>
 
-  <%= form_tag :action => 'update' do %>
+  <%= form_for(@prefs) do %>
   <div id="tabs">
   	<ul>
       <li><a href="#tabs-1"><%= t('preferences.tabs.profile')%></a></li>
@@ -25,18 +13,10 @@
       <li><a href="#tabs-3"><%= t('preferences.tabs.date_and_time')%></a></li>
       <li><a href="#tabs-4"><%= t('preferences.tabs.tracks_behavior')%></a></li>
     </ul>
-  	<div id="tabs-1">
-      <%= render :partial => 'profile'%>
-    </div>
-  	<div id="tabs-2">
-      <%= render :partial => 'authentication'%>
-    </div>
-  	<div id="tabs-3">
-      <%= render :partial => 'date_and_time'%>
-    </div>
-  	<div id="tabs-4">
-      <%= render :partial => 'tracks_behavior'%>
-    </div>
+  	<div id="tabs-1"><%= render :partial => 'profile'%></div>
+  	<div id="tabs-2"><%= render :partial => 'authentication'%></div>
+  	<div id="tabs-3"><%= render :partial => 'date_and_time'%></div>
+  	<div id="tabs-4"><%= render :partial => 'tracks_behavior'%></div>
   </div>
 
   <br/>
diff --git a/config/routes.rb b/config/routes.rb
index e3c23214..9c6068ac 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -152,6 +152,7 @@ Tracksapp::Application.routes.draw do
   match 'signup' => "users#new"
   
   resources :notes
+  resources :preferences
   
   match 'search' => 'search#index'
   match 'search/results' => 'search#results', :via => 'post'