diff --git a/make-pages/GalleryPage.hs b/make-pages/GalleryPage.hs
index f6f8116..d17f275 100644
--- a/make-pages/GalleryPage.hs
+++ b/make-pages/GalleryPage.hs
@@ -1,10 +1,12 @@
+{-# LANGUAGE TransformListComp #-}
 module GalleryPage (make) where
 
 import Control.Exception
-import Data.Function (on, (&))
-import Data.List (sortBy, groupBy)
+import Data.Function (on)
+import Data.List (sortOn, groupBy)
 import qualified Data.Text.Lazy as Lazy
 import System.FilePath ((</>), takeDirectory)
+import GHC.Exts (Down (..), the)
 
 import BuilderQQ
 import Depend (thumbFile)
@@ -42,12 +44,12 @@ make' title nsfw infos = [b|@0
  where
   items = map (uncurry $ makeYearItems nsfw) infosByYear
   infosByYear =
-    infos & sortBy  (cmpInfo `on` #second)
-          & map     (\fi -> (fi, #year $ #second fi))
-          & groupBy ((==) `on` #second)
-          & map     (\ys -> (#second (head ys), map #first ys))
-  cmpInfo (Info {date = d1, title = t1}) (Info {date = d2, title = t2}) =
-    compare d2 d1 <> compare t1 t2
+    [(the year, infopath) |
+      infopath@(_, info) <- infos,
+      then sortOn by Down info,
+      let year = #year info,
+      then group by Down year using groupBy']
+  groupBy' f = groupBy ((==) `on` f)
 
 makeYearItems :: Bool -- ^ nsfw
               -> Integer -- ^ year
diff --git a/make-pages/Info.hs b/make-pages/Info.hs
index 690267f..694f919 100644
--- a/make-pages/Info.hs
+++ b/make-pages/Info.hs
@@ -15,6 +15,7 @@ import Control.Applicative
 import Data.Foldable (find)
 import qualified Data.Map.Strict as Map
 import Data.Maybe (isJust, isNothing)
+import Data.Ord (comparing)
 import Data.String (IsString)
 import Data.Text (Text)
 import qualified Data.Text as Text
@@ -87,6 +88,9 @@ instance HasField "year"  Info Integer where getField = #first  . #dmy
 instance HasField "month" Info Int     where getField = #second . #dmy
 instance HasField "day"   Info Int     where getField = #third  . #dmy
 
+instance Ord Info where
+  compare = comparing \Info {date, title} -> (date, title)
+
 
 instance FromYAML Info where
   parseYAML = YAML.withMap "info" \m ->