--- a/sinatra/events.rb
+++ b/sinatra/events.rb
@@ -10,6 +10,7 @@ DataMapper::Database.setup({
 
 class Event < DataMapper::Base
   property :name, :string
+  property :description, :text
 end
 Event.table.create!
 
@@ -21,31 +22,38 @@ get '/events' do
   haml(layout('Events', %q{
     %h1= "Events"
     %form{:action => '/events', :method => 'POST'}
-      %table
-        %tr
-          %th Name
-          %td 
-            %input{:type => 'text', :name => 'name', :size => 30}
-        %tr
-          %td
-          %td
-            %input{:type => 'submit', :value => 'Create Event'}
+      %fieldset
+        %legend New Event
+
+        %label{:for => 'name'} Name
+        %input{:type => 'text', :name => 'name', :id => 'name', :size => 30}
+        %br
+
+        %label{:for => 'description'} Description
+        %textarea{:type => 'description', :name => 'description', :id => 'description', :cols => 30, :rows => 4}
+        %br
+
+        %input{:type => 'submit', :class => 'submit', :value => 'Create'}
     - if @events.empty?
       %p No events found.
     - else
-      %table.long
-        - c = 'even'
+      %table
+        %caption Events
+        %tr{:class => 'odd'}
+          %th{:class => 'name', :scope => 'col'} Name
+        - c = 'odd'
         - @events.each do |e|
           %tr{:class => (c == 'even' ? c = 'odd' : c = 'even') }
-            %td
-              %a{:href => "/event/#{e.id}" }
-                %code= e.name
+            %td{:class => 'name'}
+              %a{:href => '#'}= e.name
+              = e.description
   }))
 end
 
 post '/events' do
   name = params[:name].to_s.strip
-  x = Event.new(:name => name).save
+  description = params[:description].to_s.strip
+  x = Event.new(:name => name, :description => description).save
   redirect '/events'
 end
 
@@ -70,70 +78,62 @@ body
     family: Verdana, Arial, "Bitstream Vera Sans", Helvetica, sans-serif
     color: black
   line-height: 160%
-  background-color: white
-  margin: 2em
+  background: #b5b5b5
+  margin: 0
+  padding: 30px
 
-#navigation
-  a
-    background-color: #e0e0e0
-    color: black
-    text-decoration: none
-    padding: 2px
-  padding: 5px
-  border-bottom: 1px black solid
-  
-#action
-  text-align: right
-  
-.addtag
-  padding: 5px 0
-  
 h1
   display: block
   padding-bottom: 5px
 
 a
   color: black
-a.exists
-  font-weight: bold
-a.unknown
-  font-style: italic
-
-.comments
-  margin: 10px 20px
-  .comment
-    .head
-      background: #eee
-      padding: 4px
-    .comment-text
-      padding: 10px
-      color: #333
+
+form
+  label
+    float: left
+    text-align: right
+    width: 200px
+    :font
+      weight: bold
   
-table.long
+  input, textarea
+    margin-left: 210px
+    display: block
+    margin-bottom: 0pt
+    width: 300px
+
+table
   width: 100%
+  border: 1px solid #000
+  background: #fff
+  border-collapse: collapse
   
-table
-  tr.even
-    td
-      background: #eee
+  caption
+    margin: 0
+    padding: 8px 20px
+    text-align: left
+    border: 1px solid #000
+    border-bottom: none
+    background: #fff
+  th, td
+    margin: 0
+    padding: 8px 20px
+    text-align: center
+    border-bottom: 1px solid #b5b5b5
+  th.name, td.name
+    text-align: left
+  th
+    color: #999
   tr.odd
-    td
-      background: #fff
-      
-table
-  tr
-    th
-      text-align: left
-      padding: 3px
-      vertical-align: top
-    td.open
-      background: #ada
-    td.resolved
-      background: #abd
-    td.hold
-      background: #dda
-    td.invalid
-      background: #aaa  
+    background: #e6e6e6
+  tr.even
+    background: #f1f1f1
+  td
+    a
+      display: block
+      :font
+        weight: bold
       
 .submit
   font-size: large