diff --git a/layouts/partials/initial.html b/layouts/partials/initial.html
index 5dc9674eb8..1213c82ad2 100644
--- a/layouts/partials/initial.html
+++ b/layouts/partials/initial.html
@@ -1 +1,6 @@
+{{- if or .IsHome (not .Title) }}
+  {{- $title := .Site.Title }}
+  {{- partial "heading-pre.html" . }}<h1 id="{{ $title | anchorize }}">{{ $title }}</h1>{{ partial "heading-post.html" . }}
+{{- end }}
+
 {{- partial "initial.md" . | markdownify }}
\ No newline at end of file
diff --git a/layouts/partials/initial.md b/layouts/partials/initial.md
index 8a6ddc428a..8a8f57ad51 100644
--- a/layouts/partials/initial.md
+++ b/layouts/partials/initial.md
@@ -1,6 +1,9 @@
-# Create this Page
+## Create this Page
 
 You need to create a file for this page. You can either
 
-- create an _index.md, index.md or otherly named markdown file (depending on Hugo's bundle type) in *content* folder and fill it with Markdown content
-- create an *index.html* file in the <b>static</b> folder and fill the file with HTML content
\ No newline at end of file
+- create a file in the `content` folder and fill it with Markdown content
+  - inside a folder named by the page's title like `<TITLE>/_index.md` or `<TITLE>/index.md`
+  - named by the page's title like `<TITLE>.md`
+- create a file in the `static` folder and fill it with HTML content
+  - inside a folder named by the page's title like `<TITLE>/index.html`