diff --git a/src/database.py b/src/database.py
index d6cce5dfef14505a6f15338cf2706e8cc1773a81..e9f24fe4a3673c0c8d267d2b465f4877cbfd4f5c 100644
--- a/src/database.py
+++ b/src/database.py
@@ -1,27 +1,36 @@
 from flask import Flask
 from flask_cors import CORS
+from flask_bs4 import Bootstrap
 from flask_sqlalchemy import SQLAlchemy
 from logging.config import dictConfig
 from flask_admin import Admin
 
-app = Flask('app')
-CORS(app)
-app.config.from_object("config")
-port = app.config['PORT']
-ITEMS_PER_PAGE = app.config['ITEMS_PER_PAGE']
-DB_URL = 'postgresql+psycopg2://{user}:{pw}@{url}/{db}'.format(
-    user=app.config['POSTGRES_USER'],
-    pw=app.config['POSTGRES_PW'],
-    url=app.config['POSTGRES_URL'],
-    db=app.config['POSTGRES_DB'])
-app.config['SQLALCHEMY_DATABASE_URI'] = DB_URL
-app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False  # silence the deprecation warning
-run_run_with_debug = app.config['APP_DEBUGGER_ACTIVE']
-app.config['FLASK_ADMIN_SWATCH'] = 'superhero'
+
+def create_app():
+    app = Flask('app')
+    CORS(app)
+    Bootstrap(app)
+    app.config.from_object("config")
+    DB_URL = 'postgresql+psycopg2://{user}:{pw}@{url}/{db}'.format(
+        user=app.config['POSTGRES_USER'],
+        pw=app.config['POSTGRES_PW'],
+        url=app.config['POSTGRES_URL'],
+        db=app.config['POSTGRES_DB'])
+    app.config['SQLALCHEMY_DATABASE_URI'] = DB_URL
+    app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False  # silence the deprecation warning
+    app.config['FLASK_ADMIN_SWATCH'] = 'superhero'
+    return app
+
+
+app = create_app()
 admin = Admin(app, name='covid19admin', template_mode='bootstrap4')
 db = SQLAlchemy(app)
 db.create_all()
 
+port = app.config['PORT']
+run_run_with_debug = app.config['APP_DEBUGGER_ACTIVE']
+ITEMS_PER_PAGE = app.config['ITEMS_PER_PAGE']
+
 my_logging_config = {
         'version': 1,
         'formatters': {'default': {