diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..7489cdd894cec9aed067bab297c2df1cb1c4d5d1
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,3 @@
+
+build-site:
+    script: make
diff --git a/cl-site.asd b/cl-site.asd
index 65ffb440b08530d274f25651ed9f005bde69d8dc..8c57962a0e887f2d5534eaaaa4be3321c05b1b5a 100644
--- a/cl-site.asd
+++ b/cl-site.asd
@@ -1,26 +1,34 @@
-(defsystem "cl-site"
-  :name "cl-site"
-  :version "0.0.1"
-  :maintainer "C. Yang"
-  :author "C. Yang"
-  :licence "TBD"
-  :description "Static site generator for CLnet, written in CL."
-  :depends-on ("cl-mustache")
-  :serial t
-  :components ((:file "package")
-               (:file "globals")
-               (:file "helpers")
-               (:file "process")
-               (:file "main"))
-  :in-order-to ((asdf:test-op (asdf:test-op cl-site/t))))
-
-(defsystem cl-site/t
-  :defsystem-depends-on ("prove-asdf")
-  :depends-on ("cl-site"
-               "prove")
-  :pathname "t"
-  :components ((:test-file "site"))
-  :perform (asdf:test-op (op c)
-                         (uiop:symbol-call :prove-asdf 'run-test-system c)))
-
-
+;;;; -*- Mode: Lisp; Syntax: ANSI-Common-Lisp; Base: 10 -*-
+(in-package :cl-user)
+
+(asdf:defsystem cl-site
+  :name "cl-site"
+  :version "0.0.1"
+  :maintainer "C. Yang"
+  :author "C. Yang"
+  :licence "TBD"
+  :description "Static site generator for CLnet, written in CL"
+
+  :depends-on (:cl-mustache)
+
+  :components ((:module source
+                        :pathname ""
+                        :serial t
+                        :depends-on (package)
+                        :components ((:file "globals")
+                                     (:file "helpers")
+                                     (:file "process")
+                                     (:file "main")))
+               (:module package
+                        :pathname ""
+                        :components ((:file "package"))))
+  :in-order-to ((asdf:test-op (asdf:test-op cl-site/t))))
+
+;;(asdf:defsystem cl-site/t
+;;  :defsystem-depends-on (prove-asdf)
+;;  :depends-on (cl-site prove)
+;;  :components ((:module site
+;;                        :pathname "t/"
+;;                        :components ((:test-file "site"))))
+;;  :perform (asdf:test-op (op c)
+;;                         (uiop:symbol-call :prove-asdf 'run-test-system c)))
diff --git a/content/about.html b/content/about.html
index a1bb3683723abc6a17c6b1ee18f6d19f5565bb4a..7c08562cbf8a401530c476b61f82ed29de1b6ef7 100644
--- a/content/about.html
+++ b/content/about.html
@@ -7,13 +7,13 @@ related to the programming language Common Lisp.
 <p>The site is run under the governance of the <a
 href="http://www.cl-foundation.org/">Common Lisp Foundation</a> and
 maintained mostly by a committee of volunteers. <a
-href="/contribute/">Please consider donating</a>.</p>
+href="/contribute">Please consider donating</a>.</p>
 
 <p>Its source is hosted
 on <a href="https://gitlab.common-lisp.net/clo/cl-site">gitlab.common-lisp.net</a>.
 </p>
 
-<p>If you want to request a project, <a href="/project-intro/">read
+<p>If you want to request a project, <a href="/project-intro">read
 this document</a>.</p>
 
 <p>If you have questions, suggestions or comments about this site or
diff --git a/layout/templates/layout_2018.html b/layout/templates/layout_2018.html
index 8d9cbd7e627bd99b2345bfd33885f9ac0ecde6e3..b473cf681212232c6f346ede0af04a830af2b4c5 100644
--- a/layout/templates/layout_2018.html
+++ b/layout/templates/layout_2018.html
@@ -27,7 +27,7 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
           <ul class="navbar-nav mr-auto">
             <li class="nav-item">
-              <a href="/downloads/" class="nav-link">Getting started</a>
+              <a href="/downloads" class="nav-link">Getting started</a>
             </li>
             <li class="nav-item">
               <a href="/documentation" class="nav-link">Documentation</span></a>
@@ -38,26 +38,26 @@
             <li class="nav-item dropdown">
               <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Projects <span class="caret"></span></a>
               <div class="dropdown-menu" role="menu">
-                <a class="dropdown-item" href="/project-intro/">Hosting services</a>
-                <a class="dropdown-item" href="/phub/">Projects hub</a>
+                <a class="dropdown-item" href="/project-intro">Hosting services</a>
+                <a class="dropdown-item" href="/phub">Projects hub</a>
               </div>
             </li>
             <li class="nav-item dropdown">
               <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown">Resources <span class="caret"></span></a>
               <div class="dropdown-menu" role="menu">
-                <a class="dropdown-item" href="/tools/">Tools</a>
-                <a class="dropdown-item" href="/implementations/">Common Lisp Implementations</a>
-                <a class="dropdown-item" href="/faq/">FAQ</a>
+                <a class="dropdown-item" href="/tools">Tools</a>
+                <a class="dropdown-item" href="/implementations">Common Lisp Implementations</a>
+                <a class="dropdown-item" href="/faq">FAQ</a>
               </div>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="/contribute/">Contribute</a>
+              <a class="nav-link" href="/contribute">Contribute</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="/lisp-companies/">Stories</a>
+              <a class="nav-link" href="/lisp-companies">Stories</a>
             </li>
             <li class="nav-item">
-              <a class="nav-link" href="/about/">About</a>
+              <a class="nav-link" href="/about">About</a>
             </li>
           </ul>
         </div>