diff --git a/views/about.haml b/views/about.haml
index a82a341..8447097 100644
--- a/views/about.haml
+++ b/views/about.haml
@@ -1,12 +1,12 @@
 .grid_9
   %h1= @page_title = "About this website"
   
-  %p
+  %p.vcard
     This website was designed and written by 
-    %a{ :href => 'http://adrianshort.co.uk' } Adrian Short
+    %a.fn.url{ :href => 'http://adrianshort.co.uk' } Adrian Short
     \.
     You can contact me by email at 
-    %a{ :href => "mailto:adrian.short@gmail.com" } adrian.short@gmail.com
+    %a.email{ :href => "mailto:adrian.short@gmail.com" } adrian.short@gmail.com
     and 
     %a{ :href => "http://twitter.com/adrianshort" } follow me on Twitter
     \.
diff --git a/views/wards.haml b/views/wards.haml
index e0f0576..869e560 100644
--- a/views/wards.haml
+++ b/views/wards.haml
@@ -42,12 +42,12 @@
 
 .grid_6  
   - for candidate in @parly_candidates
-    %p
-      %span.candidate_name
+    %p.vcard
+      %span.candidate_name.fn
         = candidate.forenames.split(' ')[0]
         = candidate.surname
       %br
-      %span.candidate_party
+      %span.candidate_party.org
         = candidate.party.name  
     
   %p.highlight
@@ -59,10 +59,10 @@
 
 .grid_6  
   - for candidate in @council_candidates
-    %p
-      %span.candidate_name
+    %p.vcard
+      %span.candidate_name.fn
         = candidate.forenames.split(' ')[0]
         = candidate.surname
       %br
-      %span.candidate_party
+      %span.candidate_party.org
         = candidate.party.name
\ No newline at end of file