diff --git a/extra/webapps/mason/download.xml b/extra/webapps/mason/download.xml
index 6dca81baf8..7e50f958cd 100644
--- a/extra/webapps/mason/download.xml
+++ b/extra/webapps/mason/download.xml
@@ -1,8 +1,11 @@
 <?xml version='1.0' ?>
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
 <t:chloe xmlns:t="http://factorcode.org/chloe/1.0">
 
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml">
   <head>
     <link rel="stylesheet" href="http://factorcode.org/css/master.css" type="text/css" media="screen" title="no title" charset="utf-8" />
     <title>Factor binary package for <t:label t:name="platform" /></title>
diff --git a/extra/webapps/mason/mason.factor b/extra/webapps/mason/mason.factor
index 4d42617520..690c4c9660 100644
--- a/extra/webapps/mason/mason.factor
+++ b/extra/webapps/mason/mason.factor
@@ -21,12 +21,13 @@ TUPLE: mason-app < dispatcher ;
     ] dip link ;
 
 : download-grid-cell ( cpu os -- xml )
-    builder new swap >>os swap >>cpu select-tuple dup
-    [
+    builder new swap >>os swap >>cpu select-tuple [
         dup last-release>> dup
         [ "." split1 drop 16 tail* 6 head* download-link ] [ 2drop f ] if
-    ] when
-    [XML <td><-></td> XML] ;
+        [XML <td class="supported"><div class="bigdiv"><-></div></td> XML]
+    ] [
+        [XML <td /> XML]
+    ] if* ;
 
 CONSTANT: oses
 {
@@ -47,22 +48,21 @@ CONSTANT: cpus
 
 : download-grid ( -- xml )
     oses
-    [ values [ [XML <th><-></th> XML] ] map ]
+    [ values [ [XML <th align='center' scope='col'><-></th> XML] ] map ]
     [
         keys
         cpus [
             [ nip second ] [ first ] 2bi [
                 swap download-grid-cell
-            ] curry map [XML <tr><th><-></th><-></tr> XML]
+            ] curry map
+            [XML <tr><th align='center' scope='row'><-></th><-></tr> XML]
         ] with map
-    ] bi [XML <table><tr><th/><-></tr><-></table> XML]  ;
+    ] bi
+    [XML <table id="downloads" cellspacing="0"><tr><th/><-></tr><-></table> XML] ;
 
 : <download-grid-action> ( -- action )
     <action>
-    [
-        download-grid
-        xml>string "text/html" <content>
-    ] >>display ;
+    [ download-grid xml>string "text/html" <content> ] >>display ;
 
 : validate-os/cpu ( -- )
     {