diff --git a/www/web/warpmain/templates/main.html b/www/web/warpmain/templates/main.html
new file mode 100644
index 0000000000000000000000000000000000000000..fc084562e51e3e2f75347fa8f42776a8ee8bb0ff
--- /dev/null
+++ b/www/web/warpmain/templates/main.html
@@ -0,0 +1,60 @@
+{% extends "base.html" %}
+{% load humanize %}
+{% load bootstrap %}
+{% load i18n %}
+{% block content %}
+
+<h2>{% block title %}{% trans "news" %}{% endblock %}</h2>
+
+    {% if user.is_superuser %}
+        <br/>
+        <button class="btn btn-success" data-toggle="collapse" data-target="#add_news"><span class="glyphicon glyphicon-plus"></span>&nbsp;{% trans "add_news" %}</button>
+        <br/><br/>
+        <div class="panel panel-default">
+            <div class="panel-body collapse {{ collapse }}" id="add_news">
+                <form class="form-horizontal" method="POST" role="form">
+                     {{ create_news_form | bootstrap_horizontal }}
+                    <div class="form-group">
+                        <div class="col-sm-offset-2 col-sm-10">
+                            {% csrf_token %}
+                            <button style="float: left" type="submit" formmethod="post" class="btn btn-primary">{% trans "create" %}</button>
+                        </div>
+                    </div>
+                </form>
+                <div class="panel-body">
+                <H4>{%trans "markdown_support" %}</H4>
+                <pre>
+# h1
+## h2
+### h3
+#### h4
+
+1. Ordered item 1
+2. Ordered item 2
+
+* Unordered item 1
+* Unordered item 2
+
+[EXTERNAL_LINK_NAME] (http://www.example.com)
+[[INTERNAL_LINK]]
+</pre>
+                <br>
+                </div>
+            </div>
+
+        </div>
+    {%  endif %}
+    {% for news in news_list %}
+        <div class="panel panel-primary">
+            <div class="panel-heading">
+                <span class="lead">{{ news.title }}</span><div class="pull-right">{% if user.is_superuser %}<a href="/news/delete/{{ news.id }}" class="btn btn-danger"><span class="glyphicon glyphicon-trash"></span></a>{% endif %}</div>
+            </div>
+            <div class="panel-body">
+                {{ news.message|safe }}
+            </div>
+            <div class="panel-footer">
+                {% trans "created_by" %} {{ news.user }} {{ news.created | naturaltime }}
+            </div>
+        </div>
+    {% endfor %}
+{% endblock %}
\ No newline at end of file
diff --git a/www/web/warpmain/views.py b/www/web/warpmain/views.py
index 07455afef0e0df7679affaabd171429eaa338a05..51fc330ca67d407db260f9adf3a839b4601da989 100644
--- a/www/web/warpmain/views.py
+++ b/www/web/warpmain/views.py
@@ -31,7 +31,7 @@ def index(request, news_id=0):
     page_context['news_list'] = []
     news_list = News.objects.order_by("-created")
     for news in news_list:
-        news.message = markdown.markdown(escape(news.message), extensions=['markdown.extensions.nl2br','markdown.extensions.sane_lists'])
+        news.message = markdown.markdown(escape(news.message), extensions=['markdown.extensions.nl2br','markdown.extensions.sane_lists','markdown.extensions.wikilinks'])
         page_context['news_list'].append(news)
     return HttpResponse(render(request, 'warpmain/main.html', page_context))