diff --git a/templates/default-layout.cassius b/templates/default-layout.cassius
index bfa60b4..a07285e 100644
--- a/templates/default-layout.cassius
+++ b/templates/default-layout.cassius
@@ -53,8 +53,26 @@ h6
     color: #{dark yellow}
     font:  bold 80% monospace
 
+.required, .optional, .submit
+    display: grid
+    grid-gap: 0px 10px
+    grid-template-columns: 150px 300px
+    padding: 10px
+
+label
+    display: inline-grid
+    width: 100%
+    text-align: right
+
+input:not[type="submit"], select, textarea
+    display: inline-grid
+    width: 100%
+
 input[type="submit"]
+    display: inline-grid
+    width: 50%
     padding:       0.618em
+    grid-column-start: 2
     border:        none
     border-radius: 0.618em
 
diff --git a/templates/discussion/reply.hamlet b/templates/discussion/reply.hamlet
index 33202b3..239bad7 100644
--- a/templates/discussion/reply.hamlet
+++ b/templates/discussion/reply.hamlet
@@ -16,4 +16,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{replyP midParent} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/discussion/top-reply.hamlet b/templates/discussion/top-reply.hamlet
index 0917ff4..4e7905e 100644
--- a/templates/discussion/top-reply.hamlet
+++ b/templates/discussion/top-reply.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{replyP} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/group/member/new.hamlet b/templates/group/member/new.hamlet
index 58ff088..e4843fa 100644
--- a/templates/group/member/new.hamlet
+++ b/templates/group/member/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{GroupMembersR shar} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/group/new.hamlet b/templates/group/new.hamlet
index 5f17807..50c5661 100644
--- a/templates/group/new.hamlet
+++ b/templates/group/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{GroupsR} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/key/new.hamlet b/templates/key/new.hamlet
index 04b4b1d..aa3ac67 100644
--- a/templates/key/new.hamlet
+++ b/templates/key/new.hamlet
@@ -16,4 +16,5 @@ Enter the details and click "Submit" to add a new SSH key.
 
 <form method=POST action=@{KeysR} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/person-new.hamlet b/templates/person-new.hamlet
index 6f55fcb..dc4011b 100644
--- a/templates/person-new.hamlet
+++ b/templates/person-new.hamlet
@@ -16,4 +16,5 @@ Enter your details and click on "Submit" to create a new user account.
 
 <form method=POST action=@{PeopleR} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/person/notifications.hamlet b/templates/person/notifications.hamlet
index fb817f8..0020565 100644
--- a/templates/person/notifications.hamlet
+++ b/templates/person/notifications.hamlet
@@ -14,7 +14,8 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{NotificationsR shr} enctype=#{enctypeAll}>
   ^{widgetAll}
-  <input type=submit value="Mark all as read">
+  <div class="submit">
+    <input type="submit" value="Mark all as read">
 
 <div>
   $forall ((obj, (time, isRemote)), widget, enctype) <- notifications
@@ -34,6 +35,7 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
     <form method=POST action=@{NotificationsR shr} enctype=#{enctype}>
       ^{widget}
-      <input type=submit value="Mark as read">
+      <div class="submit">
+        <input type="submit" value="Mark as read">
 
     <hr>
diff --git a/templates/project/collab/new.hamlet b/templates/project/collab/new.hamlet
index 839bca8..77b8cab 100644
--- a/templates/project/collab/new.hamlet
+++ b/templates/project/collab/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{ProjectDevsR shr rp} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/project/edit.hamlet b/templates/project/edit.hamlet
index 6e229e4..cf9c4cf 100644
--- a/templates/project/edit.hamlet
+++ b/templates/project/edit.hamlet
@@ -15,4 +15,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 <form method=POST action=@{ProjectR shr prj} enctype=#{enctype}>
   <input type=hidden name=_method value=PUT>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/project/new.hamlet b/templates/project/new.hamlet
index d80cb02..328e5d4 100644
--- a/templates/project/new.hamlet
+++ b/templates/project/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{ProjectsR shr} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+      <input type="submit">
diff --git a/templates/project/role/new.hamlet b/templates/project/role/new.hamlet
index cdca39e..e6fd1a2 100644
--- a/templates/project/role/new.hamlet
+++ b/templates/project/role/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{ProjectRolesR shr} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/project/role/op/new.hamlet b/templates/project/role/op/new.hamlet
index 48b5c11..7e68487 100644
--- a/templates/project/role/op/new.hamlet
+++ b/templates/project/role/op/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{ProjectRoleOpsR shr rl} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/repo/collab/new.hamlet b/templates/repo/collab/new.hamlet
index 6beff25..6fc1f7c 100644
--- a/templates/repo/collab/new.hamlet
+++ b/templates/repo/collab/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{RepoDevsR shr rp} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/repo/edit.hamlet b/templates/repo/edit.hamlet
index 9c766ae..2707890 100644
--- a/templates/repo/edit.hamlet
+++ b/templates/repo/edit.hamlet
@@ -15,4 +15,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 <form method=POST action=@{RepoR shr rp} enctype=#{enctype}>
   <input type=hidden name=_method value=PUT>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/repo/new.hamlet b/templates/repo/new.hamlet
index e75a72d..b1e473f 100644
--- a/templates/repo/new.hamlet
+++ b/templates/repo/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{ReposR user} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/ticket/assign.hamlet b/templates/ticket/assign.hamlet
index 9312938..571a2ec 100644
--- a/templates/ticket/assign.hamlet
+++ b/templates/ticket/assign.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{TicketAssignR shr prj num} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/ticket/claim-request/new.hamlet b/templates/ticket/claim-request/new.hamlet
index c5d961e..87701ea 100644
--- a/templates/ticket/claim-request/new.hamlet
+++ b/templates/ticket/claim-request/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{ClaimRequestsTicketR shr prj num} enctype=#{etype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/ticket/dep/new.hamlet b/templates/ticket/dep/new.hamlet
index 49c13a8..899d0ef 100644
--- a/templates/ticket/dep/new.hamlet
+++ b/templates/ticket/dep/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=POST action=@{TicketDepsR shr prj num} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/ticket/edit.hamlet b/templates/ticket/edit.hamlet
index 9501ca0..c1c532a 100644
--- a/templates/ticket/edit.hamlet
+++ b/templates/ticket/edit.hamlet
@@ -15,4 +15,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 <form method=POST action=@{TicketR shar proj num} enctype=#{enctype}>
   <input type=hidden name=_method value=PUT>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/ticket/list.hamlet b/templates/ticket/list.hamlet
index eb291bd..7add25c 100644
--- a/templates/ticket/list.hamlet
+++ b/templates/ticket/list.hamlet
@@ -20,7 +20,8 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method=GET action=@{TicketsR shr prj} enctype=#{filtEnctype}>
   ^{filtWidget}
-  <input type="submit" value="Filter">
+  <div class="submit">
+    <input type="submit" value="Filter">
 
 <ul>
   $forall ts <- rows
diff --git a/templates/ticket/new.hamlet b/templates/ticket/new.hamlet
index 5e0885e..3493c1a 100644
--- a/templates/ticket/new.hamlet
+++ b/templates/ticket/new.hamlet
@@ -16,4 +16,5 @@ Enter the details and click "Submit" to create a new ticket.
 
 <form method=POST action=@{TicketsR shr prj} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/workflow/enum/ctor/new.hamlet b/templates/workflow/enum/ctor/new.hamlet
index 469dcfb..a4cbc69 100644
--- a/templates/workflow/enum/ctor/new.hamlet
+++ b/templates/workflow/enum/ctor/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method="POST" action=@{WorkflowEnumCtorsR shr wfl enm} enctype=#{etype}>
   ^{widget}
-  <input type="submit">
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/workflow/enum/new.hamlet b/templates/workflow/enum/new.hamlet
index 4ee15e7..5289f8a 100644
--- a/templates/workflow/enum/new.hamlet
+++ b/templates/workflow/enum/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method="POST" action=@{WorkflowEnumsR shr wfl} enctype=#{enctype}>
   ^{widget}
-  <input type="submit">
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/workflow/field/new.hamlet b/templates/workflow/field/new.hamlet
index 1b889d7..87cb46c 100644
--- a/templates/workflow/field/new.hamlet
+++ b/templates/workflow/field/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method="POST" action=@{WorkflowFieldsR shr wfl} enctype=#{enctype}>
   ^{widget}
-  <input type="submit">
+  <div class="submit">
+    <input type="submit">
diff --git a/templates/workflow/new.hamlet b/templates/workflow/new.hamlet
index 487d2fb..dc360bb 100644
--- a/templates/workflow/new.hamlet
+++ b/templates/workflow/new.hamlet
@@ -14,4 +14,5 @@ $# <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 <form method="POST" action=@{WorkflowsR shr} enctype=#{enctype}>
   ^{widget}
-  <input type=submit>
+  <div class="submit">
+    <input type="submit">