diff --git a/plinth/modules/ikiwiki/__init__.py b/plinth/modules/ikiwiki/__init__.py
index 8031a8677..b35f7396a 100644
--- a/plinth/modules/ikiwiki/__init__.py
+++ b/plinth/modules/ikiwiki/__init__.py
@@ -30,4 +30,5 @@ depends = ['plinth.modules.apps']
 def init():
     """Initialize the ikiwiki module."""
     menu = cfg.main_menu.get('apps:index')
-    menu.add_urlname(_('Wiki & Blog'), 'glyphicon-edit', 'ikiwiki:index', 38)
+    menu.add_urlname(_('Wiki & Blog (Ikiwiki)'), 'glyphicon-edit',
+                     'ikiwiki:index', 38)
diff --git a/plinth/modules/ikiwiki/forms.py b/plinth/modules/ikiwiki/forms.py
index cbcc4a874..088313b4d 100644
--- a/plinth/modules/ikiwiki/forms.py
+++ b/plinth/modules/ikiwiki/forms.py
@@ -26,7 +26,7 @@ from gettext import gettext as _
 class IkiwikiForm(forms.Form):
     """ikiwiki configuration form."""
     enabled = forms.BooleanField(
-        label=_('Enable ikiwiki site'),
+        label=_('Enable Ikiwiki'),
         required=False)
 
 
@@ -35,8 +35,11 @@ class IkiwikiCreateForm(forms.Form):
     type = forms.ChoiceField(
         label=_('Type'),
         choices=[('wiki', 'Wiki'), ('blog', 'Blog')])
+
     name = forms.CharField(label=_('Name'))
+
     admin_name = forms.CharField(label=_('Admin Account Name'))
+
     admin_password = forms.CharField(
         label=_('Admin Account Password'),
         widget=forms.PasswordInput())
diff --git a/plinth/modules/ikiwiki/templates/ikiwiki.html b/plinth/modules/ikiwiki/templates/ikiwiki.html
index 928f16802..3027193b8 100644
--- a/plinth/modules/ikiwiki/templates/ikiwiki.html
+++ b/plinth/modules/ikiwiki/templates/ikiwiki.html
@@ -22,15 +22,15 @@
 
 {% block content %}
 
-<p>When enabled, the ikiwiki site will be available from <a href="/ikiwiki">
-    /ikiwiki</a> path on the web server.</p>
+  <p>When enabled, the blogs and wikis will be available
+    from <a href="/ikiwiki">/ikiwiki</a>.</p>
 
-<form class="form" method="post">
-  {% csrf_token %}
+  <form class="form" method="post">
+    {% csrf_token %}
 
-  {{ form|bootstrap }}
+    {{ form|bootstrap }}
 
-  <input type="submit" class="btn btn-primary" value="Update setup"/>
-</form>
+    <input type="submit" class="btn btn-primary" value="Update setup"/>
+  </form>
 
 {% endblock %}
diff --git a/plinth/modules/ikiwiki/templates/ikiwiki_delete.html b/plinth/modules/ikiwiki/templates/ikiwiki_delete.html
index dc4726b73..4a56080fb 100644
--- a/plinth/modules/ikiwiki/templates/ikiwiki_delete.html
+++ b/plinth/modules/ikiwiki/templates/ikiwiki_delete.html
@@ -24,7 +24,9 @@
 
   <h3>Delete Wiki/Blog <em>{{ name }}</em></h3>
 
-  <p>Delete this wiki/blog permanently?</p>
+  <p>This action will remove all the posts, pages and comments
+    including revision history.  Delete this wiki/blog
+    permanently?</p>
 
   <form class="form" method="post">
     {% csrf_token %}
diff --git a/plinth/modules/ikiwiki/templates/ikiwiki_manage.html b/plinth/modules/ikiwiki/templates/ikiwiki_manage.html
index d5fbde7d0..f13dc483f 100644
--- a/plinth/modules/ikiwiki/templates/ikiwiki_manage.html
+++ b/plinth/modules/ikiwiki/templates/ikiwiki_manage.html
@@ -36,25 +36,33 @@
 
   <div class="row">
     <div class="col-sm-6">
-      <div class="list-group">
-        {% for site in sites %}
-          <div class="list-group-item clearfix">
-	    <a href="{% url 'ikiwiki:delete' site %}"
-               class="btn btn-default btn-sm pull-right"
-               role="button" title="Delete site {{ site }}">
-              <span class="glyphicon glyphicon-trash"
-                    aria-hidden="true"></span>
-            </a>
+      {% if not sites %}
+        <p>No wikis or blogs available.</p>
+        <p>
+          <a class="btn btn-primary btn-md"
+             href="{% url 'ikiwiki:create' %}">Create a Wiki or Blog</a>
+        </p>
+      {% else %}
+        <div class="list-group">
+          {% for site in sites %}
+            <div class="list-group-item clearfix">
+  	    <a href="{% url 'ikiwiki:delete' site %}"
+                 class="btn btn-default btn-sm pull-right"
+                 role="button" title="Delete site {{ site }}">
+                <span class="glyphicon glyphicon-trash"
+                      aria-hidden="true"></span>
+              </a>
 
-            <a class="wiki-label"
-	       href="/ikiwiki/{{ site }}"
-               title="Go to site {{ site }}">
-              {{ site }}
-            </a>
+              <a class="wiki-label"
+  	       href="/ikiwiki/{{ site }}"
+                 title="Go to site {{ site }}">
+                {{ site }}
+              </a>
 
-          </div>
-        {% endfor %}
-      </div>
+            </div>
+          {% endfor %}
+        </div>
+      {% endif %}
     </div>
   </div>