diff --git a/app/controllers/proposal_controller.rb b/app/controllers/proposal_controller.rb
index 7bb678e9..68803370 100644
--- a/app/controllers/proposal_controller.rb
+++ b/app/controllers/proposal_controller.rb
@@ -134,7 +134,7 @@ class ProposalController < ApplicationController
   end
 
   def show
-
+    @event = Event.find(params[:id])
   end
 
   def confirm
diff --git a/app/views/admin/events/_proposal.html.haml b/app/views/admin/events/_proposal.html.haml
index 3910be9c..c4749bb5 100644
--- a/app/views/admin/events/_proposal.html.haml
+++ b/app/views/admin/events/_proposal.html.haml
@@ -5,14 +5,17 @@
     %i= @event.subtitle
 
   .span2
-    -#= link_to "Edit Submission", edit_admin_conference_event_path(@conference.short_title, @event),
-    -#        :class => "btn btn-mini btn-primary pull-right", :style => "margin-top:20px;",  :onclick => "javascript:alert('Not ready yet');"
     = link_to "Edit Submission", "#",
             :class => "btn btn-mini btn-primary pull-right", :style => "margin-top:20px;",  :onclick => "javascript:alert('Not ready yet');"
 
 .row-fluid
   .span12
     %table.table
+      %tr
+        %td
+          %b Type
+        %td
+          = @event.event_type.title
       %tr
         %td
           %b State
diff --git a/app/views/admin/people/index.html.haml b/app/views/admin/people/index.html.haml
index af8a64bf..ae3c480f 100644
--- a/app/views/admin/people/index.html.haml
+++ b/app/views/admin/people/index.html.haml
@@ -1,5 +1,11 @@
-%table.table.table-striped.table-bordered.table-hover
+%h2 
+  People
+  - if @people
+    = "(#{@people.length})"
+%table.table.table-striped.table-bordered.table-hover#people
   %thead
+    %th
+      %b Email
     %th
       %b Last Name
     %th
@@ -11,8 +17,16 @@
     %th
   - @people.each do |person|
     %tr
+      %td= person.email
       %td= person.last_name
       %td= person.first_name
       %td= person.public_name
       %td= person.registrations.count
-      %td= link_to "View", admin_person_path(person)
\ No newline at end of file
+      %td= link_to "View", admin_person_path(person)
+
+:javascript
+  $(document).ready(function() {
+      $('#people').dataTable( {
+        sPaginationType: "full_numbers"
+      } );
+  } );
diff --git a/app/views/admin/registrations/show.html.haml b/app/views/admin/registrations/show.html.haml
index df3dc0b1..4ba9f67b 100644
--- a/app/views/admin/registrations/show.html.haml
+++ b/app/views/admin/registrations/show.html.haml
@@ -4,6 +4,10 @@
       = link_to "Export PDF", admin_conference_registrations_path(@conference.short_title, :format => :pdf), :class => "btn btn-success"
 .row-fluid
   .span12
+    %h2
+      Registrations
+      - if @registrations
+        = "(#{@registrations.length})"
     %table.table.table-striped.table-bordered.table-hover
       %thead
         %th
@@ -45,4 +49,4 @@
           %td
             = link_to "Edit", "#", :class => "btn btn-primary"
           %td
-            = link_to "Delete", "#", :class => "btn btn-danger", :confirm => "Really delete registration for #{registration.public_name}?"
\ No newline at end of file
+            = link_to "Delete", "#", :class => "btn btn-danger", :confirm => "Really delete registration for #{registration.public_name}?"
diff --git a/app/views/admin/registrations/show.pdf.prawn b/app/views/admin/registrations/show.pdf.prawn
index 0a9dfc4e..39c57e0f 100644
--- a/app/views/admin/registrations/show.pdf.prawn
+++ b/app/views/admin/registrations/show.pdf.prawn
@@ -28,11 +28,11 @@ prawn_document(:force_download=>true, :filename => @pdf_filename) do |pdf|
     else
       row << " "
     end
-    row << registration.arrival
-    row << registration.departure
+    row << registration.arrival.to_s
+    row << registration.departure.to_s
     table_array << row
   end
 
   pdf.text "#{@conference.title} Registrations", :font_size => 25
   pdf.table table_array, :header => true, :cell_style => {:size => 5, :border_width => 1}
-end
\ No newline at end of file
+end
diff --git a/app/views/admin/users/index.html.haml b/app/views/admin/users/index.html.haml
index fe72cd30..4e4a7379 100644
--- a/app/views/admin/users/index.html.haml
+++ b/app/views/admin/users/index.html.haml
@@ -1,7 +1,11 @@
 .container-fluid
   .row-fluid
     .span12
-      %table.table.table-striped.table-bordered.table-hover
+      %h2
+        Users
+        - if @users
+          = "(#{@users.length})"
+      %table.table.table-striped.table-bordered.table-hover#users
         %thead
           %th
             %b Email
@@ -55,3 +59,9 @@
                 "data-content" => user.popup_details,
                 "data-original-title" => ""
 
+:javascript
+  $(document).ready(function() {
+      $('#users').dataTable( {
+        sPaginationType: "full_numbers"
+      } );
+  } );
diff --git a/app/views/layouts/_admin_navigation.html.haml b/app/views/layouts/_admin_navigation.html.haml
index 58f99680..0bce258a 100644
--- a/app/views/layouts/_admin_navigation.html.haml
+++ b/app/views/layouts/_admin_navigation.html.haml
@@ -30,20 +30,22 @@
       %li
         = link_to "Schedule ", admin_conference_schedule_path(@conference.short_title)
 %ul.nav.secondary-nav.pull-right
+  %li
+    = link_to "User Area", root_url
   - if !@conference.nil?
     %li.dropdown
-      = link_to "#", :class => "dropdown-toggle" do
+      = link_to "#", :class => "dropdown-toggle", :id =>'drop1', "data-toggle" => 'dropdown' do
         Export
         <b class="caret"></b>
-      %ul.dropdown-menu
+      %ul.dropdown-menu{:role => 'menu', "aria-labelledby" => "drop1"}
         %li= link_to "JSON", "#"
         %li= link_to "HTML", "#"
   %li.dropdown
     - unless Conference.count == 1 && !has_role?(current_user, "admin")
-      = link_to "#", :class => "dropdown-toggle"  do
+      = link_to "#", :class => "dropdown-toggle", :id => 'drop2', "data-toggle" => 'dropdown'  do
         Conferences
         <b class="caret"></b>
-      %ul.dropdown-menu
+      %ul.dropdown-menu{:role => 'menu', "aria-labelledby" => "drop2"}
         - conferences = Conference.order("created_at DESC")
         - unless conferences.nil?
           - conferences.each do |c|
@@ -54,4 +56,4 @@
   - if has_role?(current_user, "admin")
     %li= link_to "Users", admin_users_path
   %li= link_to "People", admin_people_path
-  %li= link_to "Log out", destroy_user_session_path, :method => :delete
\ No newline at end of file
+  %li= link_to "Log out", destroy_user_session_path, :method => :delete
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
index f70b528b..ecc3dcc1 100644
--- a/app/views/layouts/_navigation.html.haml
+++ b/app/views/layouts/_navigation.html.haml
@@ -30,3 +30,16 @@
   - if user_signed_in?
     %li
       = link_to('Edit account', edit_user_registration_path)
+  %li.dropdown
+    - unless Conference.count == 1 && !has_role?(current_user, "admin")
+      = link_to "#", :class => "dropdown-toggle"  do
+        Conferences
+        <b class="caret"></b>
+      %ul.dropdown-menu
+        - conferences = Conference.order("created_at DESC")
+        - unless conferences.nil?
+          - conferences.each do |c|
+            - unless @conference == c
+              %li= link_to c.short_title, admin_conference_path(c.short_title)
+        - if has_role?(current_user, "admin")
+          %li= link_to "New Conference", new_admin_conference_path
diff --git a/app/views/proposal/_proposal_form.html.haml b/app/views/proposal/_proposal_form.html.haml
index 2c36f243..1c3ec600 100644
--- a/app/views/proposal/_proposal_form.html.haml
+++ b/app/views/proposal/_proposal_form.html.haml
@@ -6,7 +6,7 @@
       = f.input :subtitle, :as => :string
     %section#details
       = f.input :event_type_id,:as => :select, :collection => @event_types, :include_blank => false, :label => "Session Type"
-      = f.input :abstract, :input_html => {:rows => 5},
+      = f.input :abstract, :input_html => {:rows => 5, :class => "span11"},
         :required => true, :label => "Session Abstract"
       You have used
       %span#abstract-count #{@event.abstract_word_count}
@@ -19,13 +19,13 @@
       words.
       %br
       %br
-      = f.input :description, :input_html => {:rows => 5}, :hint => "This will only be shown to organizers, not to attendees."
+      = f.input :description, :input_html => {:rows => 5, :class=> "span11"}, :hint => "This will only be shown to organizers, not to attendees."
     %section#information
     = f.inputs :name => "Your Information" do
       = semantic_fields_for @person do |p|
         = p.input :public_name, :as => :string, :required => true
         = p.input :company, :as => :string, :label => "Affiliation", :hint => "This could be a company, a user group, or nothing at all."
-        = p.input :biography, :required => true, :input_html => {:rows => 5, "onkeyup" => "word_count(this, 'biography-count', 150)"}
+        = p.input :biography, :required => true, :input_html => {:rows => 5, :class => 'span11', "onkeyup" => "word_count(this, 'biography-count', 150)"}
         You have used
         %span#biography-count #{@person.biography_word_count}
         words.  Biographies are limited to 150 words.
@@ -36,7 +36,7 @@
     = f.inputs :name => "Additional Speakers" do
       Will there be any additional speakers?  If so, please enter their full names, email address, and a short
       biography for each.
-      = f.input :proposal_additional_speakers, :input_html => {:rows => 5}, :label => false
+      = f.input :proposal_additional_speakers, :input_html => {:rows => 5, :class => "span11"}, :label => false
     = f.action :submit, :as => :button, :label => "Submit Session",  :button_html => {:class => "btn btn-primary"}
 
 :javascript
@@ -54,4 +54,4 @@
 
   $("#event_abstract").bind('keyup', function() {
     word_count(this, 'abstract-count', maxcount);
-  } );
\ No newline at end of file
+  } );
diff --git a/app/views/proposal/index.html.haml b/app/views/proposal/index.html.haml
index c0d7915c..435d1be4 100644
--- a/app/views/proposal/index.html.haml
+++ b/app/views/proposal/index.html.haml
@@ -18,7 +18,7 @@
           - @events.each do |event|
             %tr
               %td
-                = event.title
+                = link_to event.title, conference_proposal_path(@conference.short_title, event.id)
               %td
                 = event.public_state
                 - if event.confirmed? && !@conference.user_registered?(current_user)
diff --git a/app/views/proposal/show.html.haml b/app/views/proposal/show.html.haml
new file mode 100644
index 00000000..38e30725
--- /dev/null
+++ b/app/views/proposal/show.html.haml
@@ -0,0 +1,84 @@
+.row-fluid
+  .span10
+    %h3
+      = @event.title
+    %i= @event.subtitle
+
+  .span2
+    - if @event.transition_possible? :confirm
+      = link_to "Confirm", conference_proposal_confirm_path(@conference.short_title, @event), :method => :put, :class => "btn btn-mini btn-success"
+    = link_to "Withdraw", conference_proposal_path(@conference.short_title, @event.id), :method => :delete,
+                            :confirm => "Are you sure you want to withdraw this proposal?", :class => "btn btn-mini btn-danger"
+
+.row-fluid
+  .span12
+    %table.table
+      %tr
+        %td
+          %b Type
+        %td
+          - if @event.type
+            = @event.type.title
+      - if !@event.track.nil?
+        %tr
+          %td
+            %b Track
+        %td
+          = @event.track.name
+      - if !@event.room.nil?
+        %tr
+          %td
+            %b Room
+          %td
+            = @event.room.name
+      - if !@event.start_time.nil?
+        %tr
+          %td
+            %b Scheduled time
+          %td
+            = @event.start_time
+      %tr
+        %td
+          %b Submitted on
+        %td= @event.created_at
+      %tr
+        %td
+          %b Last updated on
+        %td= @event.updated_at
+      %tr
+        %td
+          %b Abstract
+        %td= simple_format(@event.abstract)
+      %tr
+        %td
+          %b Description
+        %td= simple_format(@event.description)
+    - if @event.event_attachments.size > 0
+      %table.table
+        %thead
+          %th
+            %b Filename
+          %th
+            %b Title
+          %th
+            %b Size
+          %th
+            %b Public?
+          %th
+        %tbody
+        - @event.event_attachments.each do |a|
+          %tr
+            %td
+              = link_to a.attachment_file_name, conference_proposal_event_attachment_path(@conference.short_title, @event.id, a.id)
+            %td
+              = a.title
+            %td
+              = number_to_human_size a.attachment_file_size
+            %td
+              - if a.public?
+                Public
+              - else
+                Not Public
+            %td
+              = link_to "Delete", conference_proposal_event_attachment_path(@conference.short_title, @event.id, a.id),
+                :method => :delete, :confirm => "Are you sure you want to delete this attachment?  It's permanant!"