diff -r 4d8cf198bed2 -r e7512f9dc903 base/src/sqwl/cms/Layout.scala
--- a/base/src/sqwl/cms/Layout.scala	Thu Dec 06 14:03:54 2018 +0100
+++ b/base/src/sqwl/cms/Layout.scala	Thu Dec 06 15:19:41 2018 +0100
@@ -5,7 +5,7 @@
 import scalatags.Text.all._
 import scalatags.Text.tags2
 import scalatags.Text.TypedTag
-import sqwl.cms.layout.Navbar
+import sqwl.cms.layout._
 
 object Layout extends config {
 
@@ -36,13 +36,9 @@
       body(paddingTop:=120,
         Navbar(content, st),
         div(role:="main", cls:="container",
-          st match {
-            case ViewArticle(article) => div(
-              a(href:=s"/${http.prefix}/${article.pathSegment}", article.title),
-              raw(article.htmlContent)
-            )
-            case _ => ""
-          }
+          Categories(content, st),
+          ArticlesInCategory(content, st),
+          PrimaryView(content, st)
         ),
         footer(id:="footer", p(raw(" "))),
         script(src:=jquery),