diff --git a/README.md b/README.md
index 58fe9cb9e..18cc68fb0 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # MultiUserOpenRefine
 
-![MultiUserOpenRefine](logo.svg)
+![MultiUserOpenRefine](Serwer_django/static/images/logo.svg)
 
 MultiUserOpenRefine is an extension to open-source tool that, in addition to
 all the features described below, allows creating user accounts, each providing
diff --git a/Serwer_django/Serwer_django/settings.py b/Serwer_django/Serwer_django/settings.py
index 79217d3e5..18c94182a 100644
--- a/Serwer_django/Serwer_django/settings.py
+++ b/Serwer_django/Serwer_django/settings.py
@@ -37,6 +37,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'crispy_forms'
 ]
 
 MIDDLEWARE = [
@@ -130,3 +131,4 @@ LOGOUT_REDIRECT_URL = 'home'
 # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+CRISPY_TEMPLATE_PACK = 'bootstrap4'
diff --git a/Serwer_django/db.sqlite3 b/Serwer_django/db.sqlite3
index f7c223663..94342f0d9 100644
Binary files a/Serwer_django/db.sqlite3 and b/Serwer_django/db.sqlite3 differ
diff --git a/Serwer_django/static/base.css b/Serwer_django/static/base.css
index 682ef2f0e..62c12f26e 100644
--- a/Serwer_django/static/base.css
+++ b/Serwer_django/static/base.css
@@ -1,3 +1,7 @@
-body {
-    background-color: #818fb7;
+.rounded_div {
+  border-radius: 25px;
+  background: #73AD21;
+  padding: 20px;
+  width: 200px;
+  height: 150px;
 }
\ No newline at end of file
diff --git a/Serwer_django/static/images/logo.jpg b/Serwer_django/static/images/logo.jpg
deleted file mode 100644
index c478da7a3..000000000
Binary files a/Serwer_django/static/images/logo.jpg and /dev/null differ
diff --git a/Serwer_django/static/images/logo.png b/Serwer_django/static/images/logo.png
new file mode 100644
index 000000000..7920304f7
Binary files /dev/null and b/Serwer_django/static/images/logo.png differ
diff --git a/logo.svg b/Serwer_django/static/images/logo.svg
similarity index 100%
rename from logo.svg
rename to Serwer_django/static/images/logo.svg
diff --git a/Serwer_django/static/registration/login.css b/Serwer_django/static/registration/login.css
new file mode 100644
index 000000000..f9d137435
--- /dev/null
+++ b/Serwer_django/static/registration/login.css
@@ -0,0 +1,90 @@
+/* 'Open Sans' font from Google Fonts */
+@import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700);
+
+body {
+  background: #456;
+  font-family: 'Open Sans', sans-serif;
+}
+
+.login {
+  width: 400px;
+  margin: 16px auto;
+  font-size: 16px;
+}
+
+/* Reset top and bottom margins from certain elements */
+.login-header,
+.login p {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+/* The triangle form is achieved by a CSS hack */
+.login-triangle {
+  width: 0;
+  margin-right: auto;
+  margin-left: auto;
+  border: 12px solid transparent;
+  border-bottom-color: #28d;
+}
+
+.login-header {
+  background: #28d;
+  padding: 20px;
+  font-size: 1.4em;
+  font-weight: normal;
+  text-align: center;
+  text-transform: uppercase;
+  color: #fff;
+}
+
+.login-container {
+  background: #ebebeb;
+  padding: 12px;
+}
+
+/* Every row inside .login-container is defined with p tags */
+.login p {
+  padding: 12px;
+}
+
+.login input {
+  box-sizing: border-box;
+  display: block;
+  width: 100%;
+  border-width: 1px;
+  border-style: solid;
+  padding: 16px;
+  outline: 0;
+  font-family: inherit;
+  font-size: 0.95em;
+}
+
+.login input[type="email"],
+.login input[type="password"] {
+  background: #fff;
+  border-color: #bbb;
+  color: #555;
+}
+
+/* Text fields' focus effect */
+.login input[type="email"]:focus,
+.login input[type="password"]:focus {
+  border-color: #888;
+}
+
+.login input[type="submit"] {
+  background: #28d;
+  border-color: transparent;
+  color: #fff;
+  cursor: pointer;
+}
+
+.login input[type="submit"]:hover {
+  background: #17c;
+}
+
+/* Buttons' focus effect */
+.login input[type="submit"]:focus {
+  border-color: #05a;
+}
\ No newline at end of file
diff --git a/Serwer_django/templates/base.html b/Serwer_django/templates/base.html
index 6c6137e50..bb3b175c6 100644
--- a/Serwer_django/templates/base.html
+++ b/Serwer_django/templates/base.html
@@ -2,17 +2,28 @@
 <!DOCTYPE html>
 <html>
 <head>
-    {% load static %}
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
-    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
-    <link rel="stylesheet" href="{% static 'base.css'%}">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css"
+          integrity="sha384-MCw98/SFnGE8fJT3GXwEOngsV7Zt27NXFoaoApmYm81iuXoPkFOJwJ8ERdknLPMO" crossorigin="anonymous">
     <meta charset="utf-8">
-    <title>{% block title %}Auth{% endblock %}</title>
+    <title>{% block title %}MultiUserOpenRefine{% endblock %}</title>
 </head>
 <body>
 <main>
-    {% block content %}
-    {% endblock %}
+    <div class="container">
+        <div style="position: page; vertical-align: center">
+            <div class="row justify-content-center">
+                <div class="col-8">
+                    <img src="../static/images/logo.png" alt="logo"
+                         style="padding-top: 10px; height: auto; width: 50%; display: block; margin-left: auto; margin-right: auto;">
+                    <h1 class="mt-2" style="text-align: center; padding-bottom: 10px">MultiUserOpenRefine</h1>
+                    <div style="border-radius: 25px; border: 4px solid #e0e0e0; padding: 20px; box-shadow: rgba(0, 0, 0, 0.24) 0 3px 8px;">
+                        {% block content %}
+                        {% endblock %}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 </main>
 </body>
 </html>
\ No newline at end of file
diff --git a/Serwer_django/templates/home.html b/Serwer_django/templates/home.html
index 8327f5bcf..6dd9f1a1a 100644
--- a/Serwer_django/templates/home.html
+++ b/Serwer_django/templates/home.html
@@ -5,11 +5,11 @@
 
 {% block content %}
 {% if user.is_authenticated %}
-Hi {{ user.username }}!
-<p><a href="{% url 'logout' %}">Log Out</a></p>
+<p>Hi {{ user.username }}!</p>
+<p><a href="{% url 'logout' %}" class="btn btn-light">Log Out</a></p>
 {% else %}
 <p>You are not logged in</p>
-<p><a href="{% url 'login' %}">Log In</a></p>
-<p><a href="{% url 'signup' %}">Sign Up</a></p>
+<p><a href="{% url 'login' %}" class="btn btn-light">Log In</a></p>
+<p><a href="{% url 'signup' %}" class="btn btn-light">Create an account</a></p>
 {% endif %}
 {% endblock %}
\ No newline at end of file
diff --git a/Serwer_django/templates/registration/login.html b/Serwer_django/templates/registration/login.html
index ff1ed52eb..ab15b4ba6 100644
--- a/Serwer_django/templates/registration/login.html
+++ b/Serwer_django/templates/registration/login.html
@@ -8,6 +8,6 @@
 <form method="post">
   {% csrf_token %}
   {{ form.as_p }}
-  <button type="submit">Log In</button>
+  <button class="btn btn-light" type="submit">Log In</button>
 </form>
 {% endblock %}
\ No newline at end of file
diff --git a/Serwer_django/templates/registration/signup.html b/Serwer_django/templates/registration/signup.html
index 81a73ea3a..de6856aca 100644
--- a/Serwer_django/templates/registration/signup.html
+++ b/Serwer_django/templates/registration/signup.html
@@ -8,6 +8,6 @@
 <form method="post">
   {% csrf_token %}
   {{ form.as_p }}
-  <button type="submit">Sign Up</button>
+  <button class="btn btn-light" type="submit">Sign Up</button>
 </form>
 {% endblock %}
\ No newline at end of file