diff --git a/404.liquid b/_pages/404.md
similarity index 50%
rename from 404.liquid
rename to _pages/404.md
index b0d594d..f0d9804 100644
--- a/404.liquid
+++ b/_pages/404.md
@@ -5,4 +5,5 @@ title: "Page not found"
 description: "Looks like there has been a mistake. Nothing exists here."
 redirect: true
 ---
-<p>You will be redirected to the main page within 3 seconds. If not redirected, please go back to the <a href="{{ site.baseurl }}/">home page</a>.</p>
+
+You will be redirected to the main page within 3 seconds. If not redirected, please go back to the [home page]({{ site.baseurl | prepend: site.url }}).
diff --git a/news.liquid b/_pages/news.md
similarity index 98%
rename from news.liquid
rename to _pages/news.md
index 87d4d37..6223439 100644
--- a/news.liquid
+++ b/_pages/news.md
@@ -3,4 +3,5 @@ layout: page
 title: news
 permalink: /news/
 ---
+
 {% include news.liquid %}