diff --git a/_data/sidebars/home_sidebar.yml b/_data/sidebars/home_sidebar.yml
index 360c769..75b1213 100644
--- a/_data/sidebars/home_sidebar.yml
+++ b/_data/sidebars/home_sidebar.yml
@@ -13,12 +13,12 @@ entries:
     - title: News
       url: /news.html
       output: web
-    - title: The Production Merlin6 HPC Cluster
-      url: /merlin6/introduction.html
-      output: web
-    - title: The Merlin7 HPC Cluster (W.I.P.)
+    - title: Merlin7 HPC Cluster (W.I.P.)
       url: /merlin7/introduction.html
       output: web
+    - title: Merlin6 HPC Cluster
+      url: /merlin6/introduction.html
+      output: web
     - title: PSI HPC@CSCS
       url: /CSCS/index.html
       output: web
diff --git a/_data/topnav.yml b/_data/topnav.yml
index ad429db..cb57202 100644
--- a/_data/topnav.yml
+++ b/_data/topnav.yml
@@ -6,7 +6,7 @@ topnav:
       # - title: GitHub
       #   external_url: https://github.com/tomjoht/documentation-theme-jekyll
       - title: News
-        url: /news
+        url: /news.html
 
 #Topnav dropdowns
 topnav_dropdowns:
diff --git a/index.md b/index.md
index e6febe5..2c54815 100644
--- a/index.md
+++ b/index.md
@@ -8,7 +8,7 @@ permalink: index.html
 
 ![High Performance Computing and Emerging Technologies]({{ "/images/hpce_logo.png" }}){: .center-block .img-responsive width="300px" }
 
-The [HPCE group](https://www.psi.ch/en/awi/high-performance-computing-and-emerging-technologies-group) is part of the [PSI Center for Scientific Computing, Theory and Data](https://www.psi.ch/scd)
+The [HPCE group](https://www.psi.ch/en/awi/high-performance-computing-and-emerging-technologies-group) is part of the [PSI Center for Scientific Computing, Theory and Data](https://www.psi.ch/en/csd)
 at [Paul Scherrer Institute](https://www.psi.ch). It provides a range of HPC services for PSI scientists and also
 engages in research activities on technologies (data analysis and machine learning technologies) used on these systems.
 
diff --git a/pages/news/news.html b/pages/news/news.html
index f3a7021..586d282 100644
--- a/pages/news/news.html
+++ b/pages/news/news.html
@@ -12,7 +12,7 @@ folder: news
         {% for post in site.posts limit:10 %}
 
 
-    <h2><a class="post-link" href="{{ post.url | remove: "/" }}">{{ post.title }}</a></h2>
+    <h2><a class="post-link" href="{{ post.url }}">{{ post.title }}</a></h2>
         <span class="post-meta">{{ post.date | date: "%b %-d, %Y" }} /
             {% for tag in post.tags %}