diff --git a/cas_server/static/cas_server/favicon.ico b/cas_server/static/cas_server/favicon.ico
new file mode 100644
index 0000000..7a85a16
Binary files /dev/null and b/cas_server/static/cas_server/favicon.ico differ
diff --git a/cas_server/templates/cas_server/base.html b/cas_server/templates/cas_server/base.html
index 30c134c..581f3fd 100644
--- a/cas_server/templates/cas_server/base.html
+++ b/cas_server/templates/cas_server/base.html
@@ -1,6 +1,24 @@
 {% extends 'bootstrap3/bootstrap3.html' %}
 {% block bootstrap3_title %}{% block title %}{% endblock %}{% endblock %}
 
-{% load url from future %}
-
+{% load staticfiles %}
 {% load bootstrap3 %}
+
+{% block bootstrap3_extra_head %}
+<link rel="shortcut icon" href="/static/cas_server/favicon.ico?v=1" />
+<link href="{% static "cas_server/login.css" %}" rel="stylesheet">
+{% endblock %}
+
+{% block bootstrap3_content %}
+<div class="container">
+<div class="row">
+<div class="col-md-3"></div>
+<div class="col-md-6">
+{% bootstrap_messages %}
+{% block content %}
+{% endblock %}
+</div>
+<div class="col-md-3"></div>
+</div>
+    </div> <!-- /container -->
+{% endblock %}
diff --git a/cas_server/templates/cas_server/logged.html b/cas_server/templates/cas_server/logged.html
index bb82c0d..7eb0378 100644
--- a/cas_server/templates/cas_server/logged.html
+++ b/cas_server/templates/cas_server/logged.html
@@ -2,20 +2,8 @@
 {% load bootstrap3 %}
 {% load staticfiles %}
 {% load i18n %}
-{% block bootstrap3_extra_head %}
-<link href="{% static "cas_server/login.css" %}" rel="stylesheet">
-{% endblock %}
-{% block bootstrap3_content %}
-<div class="container">
-<div class="row">
-<div class="col-md-3"></div>
-<div class="col-md-6">
-{% bootstrap_messages %}
+{% block content %}
 <div class="alert alert-success" role="alert">{% trans "Logged" %}</div>
 {% bootstrap_button _('Logout') size='lg' button_class="btn-danger btn-block" href="logout" %}
-</div>
-<div class="col-md-3"></div>
-</div>
-    </div> <!-- /container -->
 {% endblock %}
 
diff --git a/cas_server/templates/cas_server/login.html b/cas_server/templates/cas_server/login.html
index 64d7567..419c71e 100644
--- a/cas_server/templates/cas_server/login.html
+++ b/cas_server/templates/cas_server/login.html
@@ -2,24 +2,12 @@
 {% load bootstrap3 %}
 {% load staticfiles %}
 {% load i18n %}
-{% block bootstrap3_extra_head %}
-<link href="{% static "cas_server/login.css" %}" rel="stylesheet">
-{% endblock %}
-{% block bootstrap3_content %}
-<div class="container">
-<div class="row">
-<div class="col-md-3"></div>
-<div class="col-md-6">
-{% bootstrap_messages %}
+{% block content %}
       <form class="form-signin" method="post">
         <h2 class="form-signin-heading">{% trans "Please loggin" %}</h2>
 {% csrf_token %}
 {% bootstrap_form form %}
 {% bootstrap_button _('Login') size='lg' button_type="submit" button_class="btn-primary btn-block"%}
       </form>
-</div>
-<div class="col-md-3"></div>
-</div>
-    </div> <!-- /container -->
 {% endblock %}
 
diff --git a/cas_server/templates/cas_server/logout.html b/cas_server/templates/cas_server/logout.html
index 7b5fdba..9de1276 100644
--- a/cas_server/templates/cas_server/logout.html
+++ b/cas_server/templates/cas_server/logout.html
@@ -2,19 +2,7 @@
 {% load bootstrap3 %}
 {% load staticfiles %}
 {% load i18n %}
-{% block bootstrap3_extra_head %}
-<link href="{% static "cas_server/login.css" %}" rel="stylesheet">
-{% endblock %}
-{% block bootstrap3_content %}
-<div class="container">
-<div class="row">
-<div class="col-md-3"></div>
-<div class="col-md-6">
-{% bootstrap_messages %}
+{% block content %}
 <div class="alert alert-success" role="alert">{% trans "Successfully logout" %}</div>
-</div>
-<div class="col-md-3"></div>
-</div>
-    </div> <!-- /container -->
 {% endblock %}
 
diff --git a/cas_server/templates/cas_server/warn.html b/cas_server/templates/cas_server/warn.html
index 768d8cf..9463992 100644
--- a/cas_server/templates/cas_server/warn.html
+++ b/cas_server/templates/cas_server/warn.html
@@ -2,19 +2,8 @@
 {% load bootstrap3 %}
 {% load staticfiles %}
 {% load i18n %}
-{% block bootstrap3_extra_head %}
-<link href="{% static "cas_server/login.css" %}" rel="stylesheet">
-{% endblock %}
-{% block bootstrap3_content %}
-<div class="container">
-<div class="row">
-<div class="col-md-3"></div>
-<div class="col-md-6">
-{% bootstrap_messages %}
+
+{% block content %}
 {% bootstrap_button _('Connect to the service') size='lg' button_class="btn-primary btn-block" href=service_ticket_url %}
-</div>
-<div class="col-md-3"></div>
-</div>
-    </div> <!-- /container -->
 {% endblock %}