diff --git a/testrail_bot/control/templates/base.html b/testrail_bot/control/templates/base.html
index 927d912..464681a 100644
--- a/testrail_bot/control/templates/base.html
+++ b/testrail_bot/control/templates/base.html
@@ -21,7 +21,6 @@
     </div>
     <ul class="nav navbar-nav">
         <li><a href="{% url 'index' %}">Test Runs</a></li>
-        <li><a href="{% url 'create_run' %}">Create New Test Run</a></li>
         <li><a href="{% url 'list_reports' %}">Reports</a></li>
         <li><a href="{% url 'help' %}">Help</a></li>
         <li><a href="{% url 'jenkins_plot' %}">Jenkins plot</a></li>
diff --git a/testrail_bot/control/templates/control/create_run.html b/testrail_bot/control/templates/control/create_run.html
index fadec4b..07c7b0a 100644
--- a/testrail_bot/control/templates/control/create_run.html
+++ b/testrail_bot/control/templates/control/create_run.html
@@ -2,6 +2,9 @@
 {% load bootstrap3 %}
 {% block section %}
 <div>
+  <input type="button" onclick="location.href={% url 'index' %}" height="8"
+         class="btn btn-primary" value="<- Back"/>
+  <h3>Create new Test Run</h3>
   <form action="{% url 'create_run' %}" method="post" class="form">
     {% csrf_token %}
       {% bootstrap_form_errors form type='non_fields' %}
diff --git a/testrail_bot/control/templates/control/index.html b/testrail_bot/control/templates/control/index.html
index e1382a6..359e975 100644
--- a/testrail_bot/control/templates/control/index.html
+++ b/testrail_bot/control/templates/control/index.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% block section %}
-<p>Test Runs:</p>
+<input type="button" onclick="location.href={% url 'create_run' %}"
+       class="btn btn-primary" value="Create new Test Run" />
+<p><b>Test Runs</b> (total {{ runs|length }} runs):</p>
 <div class="list-group">
     {% for run in runs %}
         <a href="{% url 'single_run' run.id  %}" class="list-group-item list-group-item-success">
diff --git a/testrail_bot/control/templates/control/update_run.html b/testrail_bot/control/templates/control/update_run.html
index 60d615a..c70ab0c 100644
--- a/testrail_bot/control/templates/control/update_run.html
+++ b/testrail_bot/control/templates/control/update_run.html
@@ -2,6 +2,9 @@
 {% load bootstrap3 %}
 {% block section %}
 <div>
+  <input type="button" onclick="location.href={% url 'index' %}" height="8"
+       class="btn btn-primary" value="<- Back"/>
+  <h3>Edit Test Run #{{ run_id }}</h3>
   <form action="{% url 'single_run' run_id %}" method="post" class="form">
     {% csrf_token %}
       {% bootstrap_form_errors form type='non_fields' %}