diff --git a/src/cuirass/templates.scm b/src/cuirass/templates.scm
index 5d641c433710414958b57ba7a1d48448b5427892..b0ca9ec4000c30899f35c0944c35944be1415986 100644
--- a/src/cuirass/templates.scm
+++ b/src/cuirass/templates.scm
@@ -550,13 +550,13 @@ and BUILD-MAX are global minimal and maximal (stoptime, rowid) pairs."
   (define (table-header)
     `(thead
       (tr
+       (th (@ (scope "col") (class "border-0")) '())
        (th (@ (scope "col") (class "border-0")) '())
        (th (@ (scope "col") (class "border-0")) "ID")
        (th (@ (scope "col") (class "border-0")) "Specification")
        (th (@ (scope "col") (class "border-0")) "Completion time")
        (th (@ (scope "col") (class "border-0")) "Job")
        (th (@ (scope "col") (class "border-0")) "Name")
-       (th (@ (scope "col") (class "border-0")) "Weather")
        (th (@ (scope "col") (class "border-0")) "System")
        (th (@ (scope "col") (class "border-0")) "Log"))))
 
@@ -576,6 +576,10 @@ and BUILD-MAX are global minimal and maximal (stoptime, rowid) pairs."
                    (title ,(status-title status))
                    (aria-hidden "true"))
                 ""))
+      (td (span (@ (class ,(weather-class weather))
+                   (title ,(weather-title weather))
+                   (aria-hidden "true"))
+                ""))
       (th (@ (scope "row"))
           (a (@ (href "/build/" ,(assq-ref build #:id) "/details"))
              ,(assq-ref build #:id)))
@@ -585,10 +589,6 @@ and BUILD-MAX are global minimal and maximal (stoptime, rowid) pairs."
                "鈥�"))
       (td ,(assq-ref build #:job))
       (td ,(assq-ref build #:nixname))
-      (td (span (@ (class ,(weather-class weather))
-                   (title ,(weather-title weather))
-                   (aria-hidden "true"))
-                ""))
       (td ,(assq-ref build #:system))
       (td (a (@ (href "/build/" ,(assq-ref build #:id) "/log/raw"))
                "raw"))))