diff --git a/templates/dashboard/base.html b/templates/dashboard/base.html
index 09bda05..5ac54c5 100644
--- a/templates/dashboard/base.html
+++ b/templates/dashboard/base.html
@@ -1,31 +1,32 @@
-{% load bootstrap3 %}
+{% load bootstrap5 %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
     <meta name="viewport" content="width=device-width, initial-scale=1">
     {% bootstrap_css %}
-    <script src="{% bootstrap_jquery_url %}"></script>
     {% bootstrap_javascript %}
     <title>ATrade dashboard</title>
 </head>
 
 <body>
-    <nav class="navbar navbar-default">
+    <nav class="navbar navbar-expand-lg navbar-light bg-light">
+      <div class="container-fluid">
         <div class="navbar-header">
             <a class="navbar-brand">Dashboard</a>
         </div>
-        <ul class="nav navbar-nav">
-            <li><a href="{% url 'overview' %}">Overview</a></li>
-            <li><a href="{% url 'trades_index' %}">Trades</a></li>
-            <li><a href="{% url 'closed_trades_index' %}">Closed</a></li>
-            <li><a href="{% url 'performance' %}">Performance</a></li>
+        <ul class="navbar-nav me-auto mb-2 mg-lg-0">
+            <li class="nav-item"><a class="nav-link" href="{% url 'overview' %}">Overview</a></li>
+            <li class="nav-item"><a class="nav-link" href="{% url 'trades_index' %}">Trades</a></li>
+            <li class="nav-item"><a class="nav-link" href="{% url 'closed_trades_index' %}">Closed</a></li>
+            <li class="nav-item"><a class="nav-link" href="{% url 'performance' %}">Performance</a></li>
         </ul>
-        <ul class="nav navbar-nav navbar-right">
+        <ul class="nav navbar-nav me-auto mg-2 mg-lg-0 navbar-right">
           {% if user.username %}
-          <li><a href="#">Logged in as: {{ user.username }}</a></li>
-          <li><a href="{% url 'logout' %}">Logout</a></li>
+          <li class="nav-item"><a class="nav-link" href="#">Logged in as: {{ user.username }}</a></li>
+          <li class="nav-item"><a class="nav-link" href="{% url 'logout' %}">Logout</a></li>
           {% endif %}
         </ul>
+        </div>
     </nav>
 
     {% bootstrap_messages %}
diff --git a/templates/dashboard/closed_trades.html b/templates/dashboard/closed_trades.html
index cb05d09..72fce2f 100644
--- a/templates/dashboard/closed_trades.html
+++ b/templates/dashboard/closed_trades.html
@@ -1,17 +1,17 @@
 {% extends "dashboard/base.html" %}
 {% load static %}
-{% load bootstrap3 %}
+{% load bootstrap5 %}
 {% load mathfilters %}
 {% load humanize %}
 
 {% block content %}
 <script src="http://code.highcharts.com/highcharts.js"></script>
-<div class="panel panel-default">
-	<div class="panel-header">
-		<a href="#closed_trades_filter_form" role="button" data-toggle="collapse">Apply filter...</a>
+<div class="card card-default">
+	<div class="card-header">
+		<a href="#closed_trades_filter_form" role="button" data-bs-toggle="collapse">Apply filter...</a>
 		<a href="{% url 'rebalance_closed_trades' %}" class="pull-right">Rebalance...</a>
 	</div>
-    <div class="panel-body panel-collapse collapse" id="closed_trades_filter_form">
+    <div class="card-body card-collapse collapse" id="closed_trades_filter_form" data-bs-target="#closed_trades_filter_form" aria-expanded="false">
 		<form action="{% url 'closed_trades_index' %}" method="GET">
 		{% csrf_token %}
 		{% bootstrap_form closed_trades_filter_form %}
diff --git a/templates/dashboard/login.html b/templates/dashboard/login.html
index 8794f50..0e7dcde 100644
--- a/templates/dashboard/login.html
+++ b/templates/dashboard/login.html
@@ -1,6 +1,6 @@
 {% extends "dashboard/base.html" %}
 {% load static %}
-{% load bootstrap3 %}
+{% load bootstrap5 %}
 
 {% block content %}
 
diff --git a/templates/dashboard/overview.html b/templates/dashboard/overview.html
index 98fb6ca..f080fa7 100644
--- a/templates/dashboard/overview.html
+++ b/templates/dashboard/overview.html
@@ -3,9 +3,9 @@
 {% block content %}
 <div class="panel-group">
 {% for entry in robot_states %}
-    <div class="panel panel-default">
-        <div class="panel-heading" id="heading-{{entry.instance_id}}">
-            <a role="button" data-toggle="collapse" href="#collapse-{{entry.index}}">
+    <div class="card">
+        <div class="card-header" id="heading-{{entry.instance_id}}">
+            <a role="button" data-bs-toggle="collapse" href="#collapse-{{entry.index}}">
             {{ entry.instance_id }}
             <div class="pull-right">
                 {% if entry.open_pos_counter > 0 %} <span class="label label-primary">{{ entry.open_pos_counter }}</span> {% endif %}
@@ -14,8 +14,8 @@
             </div>
             </a>
         </div>
-        <div id="collapse-{{entry.index}}" class="panel-collapse collapse">
-            <div class="panel-body">
+        <div id="collapse-{{entry.index}}" data-bs-target="#collapse-{{entry.index}}" class="panel-collapse collapse" aria-expanded="false">
+            <div class="card-body">
             <pre>{{ entry.state }}</pre>
 
             {% for position in entry.positions %}
diff --git a/templates/dashboard/performance.html b/templates/dashboard/performance.html
index fa31e18..bef4e9b 100644
--- a/templates/dashboard/performance.html
+++ b/templates/dashboard/performance.html
@@ -1,6 +1,6 @@
 {% extends "dashboard/base.html" %}
 {% load static %}
-{% load bootstrap3 %}
+{% load bootstrap5 %}
 {% load mathfilters %}
 {% load humanize %}
 
@@ -8,9 +8,9 @@
 
 <div class="panel panel-default">
 	<div class="panel-header">
-		<a href="#trades_filter_form" role="button" data-toggle="collapse">Apply filter...</a>
+		<a href="#trades_filter_form" role="button" data-bs-toggle="collapse">Apply filter...</a>
 	</div>
-    <div class="panel-body panel-collapse collapse" id="trades_filter_form">
+    <div class="panel-body panel-collapse collapse" id="trades_filter_form" data-bs-target="#closed_trades_filter_form" aria-expanded="false">
 		<form action="{% url 'performance' %}" method="GET">
 		{% csrf_token %}
 		{% bootstrap_form trades_filter_form %}
diff --git a/templates/dashboard/trades.html b/templates/dashboard/trades.html
index f119e28..4550c17 100644
--- a/templates/dashboard/trades.html
+++ b/templates/dashboard/trades.html
@@ -1,14 +1,14 @@
 {% extends "dashboard/base.html" %}
 {% load static %}
-{% load bootstrap3 %}
+{% load bootstrap5 %}
 {% load mathfilters %}
 {% load humanize %}
 
 {% block content %}
 <div class="panel-header">
-    <a href="#closed_trades_filter_form" role="button" data-toggle="collapse">Apply filter...</a>
+    <a href="#closed_trades_filter_form" role="button" data-bs-toggle="collapse">Apply filter...</a>
 </div>
-<div class="panel-body panel-collapse collapse" id="closed_trades_filter_form">
+<div class="panel-body panel-collapse collapse" id="closed_trades_filter_form" data-bs-target="#closed_trades_filter_form" aria-expanded="false">
     <form action="{% url 'trades_index' %}" method="GET">
     {% csrf_token %}
     {% bootstrap_form closed_trades_filter_form %}
diff --git a/templates/dashboard/unbalanced_trades.html b/templates/dashboard/unbalanced_trades.html
index ff082e1..f0ee138 100644
--- a/templates/dashboard/unbalanced_trades.html
+++ b/templates/dashboard/unbalanced_trades.html
@@ -1,6 +1,6 @@
 {% extends "dashboard/base.html" %}
 {% load static %}
-{% load bootstrap3 %}
+{% load bootstrap5 %}
 {% load mathfilters %}
 {% load humanize %}
 
diff --git a/urls.py b/urls.py
index 76f2df6..94892fe 100644
--- a/urls.py
+++ b/urls.py
@@ -1,18 +1,18 @@
 
-from django.conf.urls import url
+from django.urls import re_path
 
 from . import views
 
 urlpatterns = [
-        url(r'^$', views.overview, name='overview'),
-        url(r'^login$', views.login_view, name='login'),
-        url(r'^logout$', views.logout_view, name='logout'),
-        url(r'^add_instance$', views.add_instance, name='add_instance'),
-        url(r'^delete_instance/(?P<instance_id>[^/]+)$', views.delete_instance, name='delete_instance'),
-        url(r'^trades/$', views.trades_index, name='trades_index'),
-        url(r'^add_trade/$', views.add_trade, name='add_trade'),
-        url(r'^delete_trade/(?P<trade_id>[^/]+)$', views.delete_trade, name='delete_trade'),
-        url(r'^closed_trades/$', views.closed_trades_index, name='closed_trades_index'),
-        url(r'^rebalance_closed_trades/$', views.rebalance_closed_trades, name='rebalance_closed_trades'),
-        url(r'^performance/$', views.performance, name='performance')
+        re_path(r'^$', views.overview, name='overview'),
+        re_path(r'^login$', views.login_view, name='login'),
+        re_path(r'^logout$', views.logout_view, name='logout'),
+        re_path(r'^add_instance$', views.add_instance, name='add_instance'),
+        re_path(r'^delete_instance/(?P<instance_id>[^/]+)$', views.delete_instance, name='delete_instance'),
+        re_path(r'^trades/$', views.trades_index, name='trades_index'),
+        re_path(r'^add_trade/$', views.add_trade, name='add_trade'),
+        re_path(r'^delete_trade/(?P<trade_id>[^/]+)$', views.delete_trade, name='delete_trade'),
+        re_path(r'^closed_trades/$', views.closed_trades_index, name='closed_trades_index'),
+        re_path(r'^rebalance_closed_trades/$', views.rebalance_closed_trades, name='rebalance_closed_trades'),
+        re_path(r'^performance/$', views.performance, name='performance')
 ]
