diff --git a/src/home/hd-task-navigator.c b/src/home/hd-task-navigator.c
index 65156ca..05506c6 100644
--- a/src/home/hd-task-navigator.c
+++ b/src/home/hd-task-navigator.c
@@ -36,6 +36,9 @@
  * }}}
  */
 
+/* Uncomment if you want single-column layout... */
+//#define SINGLE_COLUMN
+
 /* Include files {{{ */
 #include <math.h>
 #include <errno.h>
@@ -104,8 +107,13 @@
  * button reaction area.  1-2 thumbnails are LARGE, 3-6 are MEDIUM
  * and the rest are SMALL.
  */
-#define THUMB_LARGE_WIDTH         344
-#define THUMB_LARGE_HEIGHT        214
+#if defined(SINGLE_COLUMN)
+# define THUMB_LARGE_WIDTH         600
+# define THUMB_LARGE_HEIGHT        373
+#else
+# define THUMB_LARGE_WIDTH         344
+# define THUMB_LARGE_HEIGHT        214
+#endif
 #define THUMB_MEDIUM_WIDTH        224
 #define THUMB_MEDIUM_HEIGHT       150
 #define THUMB_SMALL_WIDTH         152
@@ -1747,6 +1755,21 @@ calc_layout (Layout * lout)
   /* Figure out how many thumbnails to squeeze into one row
    * (not the last one, which may be different) and the maximum
    * number of fully visible rows at a time. */
+
+#if defined(SINGLE_COLUMN)
+  /* Single-column extra-large layout */
+  lout->thumbsize = &Thumbsizes.large;
+  lout->cells_per_row = 1;
+  nrows_per_page = 1;
+#else
+  /* Two-column "big" layout */
+  lout->thumbsize = &Thumbsizes.large;
+  lout->cells_per_row = 2;
+  nrows_per_page = NThumbnails <= 2 ? 1 : 2;
+#endif
+
+#if 0
+  /* The original Maemo 5 layout method */
   if (NThumbnails <= 3)
     {
       lout->thumbsize = NThumbnails <= 2
@@ -1766,6 +1789,7 @@ calc_layout (Layout * lout)
       lout->cells_per_row = 4;
       nrows_per_page = NThumbnails <= 8 ? 2 : 3;
     }
+#endif
 
   /*
    * Gaps are always the same, regardless of the number of thumbnails.