diff --git a/caimira/apps/templates/base/calculator.form.html.j2 b/caimira/apps/templates/base/calculator.form.html.j2
index fb25af92..448350b7 100644
--- a/caimira/apps/templates/base/calculator.form.html.j2
+++ b/caimira/apps/templates/base/calculator.form.html.j2
@@ -5,13 +5,13 @@
 
 {% block extra_headers %}
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css" integrity="sha512-aOG0c6nPNzGk+5zjwyJaoRUgCdOrfSDhmMID2u4+OIslr0GjpLKo7Xm0Ao3xmpM4T8AmIouRkqwj1nrdVsLKEQ==" crossorigin="anonymous">
-    <link rel="stylesheet" href="{{ get_calculator_url() }}/static/css/form.css">
+    <link rel="stylesheet" href="{{ get_calculator_url('/static/css') }}/form.css">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css"/>
 {% endblock extra_headers %}
 
 {% block body_scripts %}
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js" integrity="sha512-uto9mlQzrs59VwILcLiRYeLKPPbS/bT71da/OEBYEwcdNUk8jYIy+D176RYoop1Da+f9mvkYrmj5MCLZWEtQuA==" crossorigin="anonymous"></script>
-    <script src="{{ get_calculator_url() }}/static/js/form.js"></script>
+    <script src="{{ get_calculator_url('/static/js') }}/form.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
 {% endblock body_scripts %}
 
@@ -31,7 +31,7 @@
   <div class="container container--padding">
     <div class="d-flex header-height">
       <h1 class="align-self-center">Calculator</h1>
-      <img src="{{ get_url() }}/static/images/caimira_logo.200x200.png" class="logo_form align-self-center ml-3">
+      <img src="{{ get_url('/static/images') }}/caimira_logo.200x200.png" class="logo_form align-self-center ml-3">
     </div>
   </div>
 </header>
@@ -222,7 +222,7 @@
             If these conditions are not met, the air exchange might not be homogenous producing an artificially lower risk further away from the window.
             <br>
             <br>
-            <img src="{{ get_url() }}/static/images/nat_vent_dimensions.png" id="nat_vent_image">
+            <img src="{{ get_url('/static/images') }}/nat_vent_dimensions.png" id="nat_vent_image">
           </div>
         </div>
       </div>
@@ -327,14 +327,14 @@
           <input type="radio" id="mask_type_1" name="mask_type" value="Type I" checked="checked" onclick="require_fields(this)">
             <label for="mask_type_1">
               Surgical/Type I
-              <img class="mask_icons" src="{{ get_url() }}/static/images/masks/t1.png">
+              <img class="mask_icons" src="{{ get_url('/static/images/masks') }}/t1.png">
             </label>
         </div>
         <div>
           <input type="radio" id="mask_type_ffp2"  name="mask_type" value="FFP2" onclick="require_fields(this)">
             <label for="mask_type_ffp2">
               Respirator/FFP2
-              <img class="mask_icons" src="{{ get_url() }}/static/images/masks/ffp2.png">
+              <img class="mask_icons" src="{{ get_url('/static/images/masks') }}/ffp2.png">
             </label>
         </div>
       </div>
@@ -342,7 +342,7 @@
         <input type="radio" id="mask_type_cloth"  name="mask_type" value="Cloth" onclick="require_fields(this)">
           <label for="mask_type_cloth">
             Cloth
-            <img class="mask_icons" src="{{ get_url() }}/static/images/masks/cloth.png">
+            <img class="mask_icons" src="{{ get_url('/static/images/masks') }}/cloth.png">
           </label>
       </div>
     </div>
diff --git a/caimira/apps/templates/base/calculator.report.html.j2 b/caimira/apps/templates/base/calculator.report.html.j2
index 261bd2da..7c202f6f 100644
--- a/caimira/apps/templates/base/calculator.report.html.j2
+++ b/caimira/apps/templates/base/calculator.report.html.j2
@@ -6,12 +6,12 @@
 
   	<title>Report | CAiMIRA (CERN Airborne Model for Indoor Risk Assessment)</title>
 
-	<link rel="stylesheet" type="text/css" href="{{ get_calculator_url() }}/static/css/report.css">
+	<link rel="stylesheet" type="text/css" href="{{ get_calculator_url('/static/css') }}/report.css">
 	<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-	<link rel="stylesheet" href="{{ get_url() }}/static/css/style.css">
-	<link rel="icon" type="image/x-icon" href="static/icons/favicon.ico">
+	<link rel="stylesheet" href="{{ get_url('/static/css') }}/style.css">
+	<link rel="icon" type="image/x-icon" href="{{ get_url('/static/icons') }}/favicon.ico">
 	<script src="https://d3js.org/d3.v7.min.js"></script>
-	<script src="{{ get_calculator_url() }}/static/js/report.js" type="application/javascript"></script>
+	<script src="{{ get_calculator_url('/static/js') }}/report.js" type="application/javascript"></script>
 
 </head>
 
@@ -26,7 +26,7 @@
 {% block report_header %}
 
 	<div id="report-header-div" class="d-flex flex-row" style="margin: 1%">
-		<a href="/" class="align-self-center"><img id="report_logo" src="{{ get_url() }}/static/images/caimira_logo.200x200.png" class="d-inline-block align-middle mr-3"></a>
+		<a href="{{ get_url() }}" class="align-self-center"><img id="report_logo" src="{{ get_url('/static/images') }}/caimira_logo.200x200.png" class="d-inline-block align-middle mr-3"></a>
 		<div style="margin-right: -105px" class='align-self-center mr-auto'>
 			<h2 class="header_text mb-0"><a href="{{ permalink.shortened }}" style="color: #2f4858">REPORT - {{ form.simulation_name }}</a></h2>
 			<p class="mb-0" id="report_version"> Created {{ creation_date }} using CAiMIRA calculator version v{{ form.calculator_version }}</p>
@@ -85,7 +85,7 @@
 													{% endif %}
 												</h6>
 												<br>
-												<img src="{{ get_url() }}/static/images/long_range_anim.png" class="align-middle mb-3 pi-image">
+												<img src="{{ get_url('/static/images') }}/long_range_anim.png" class="align-middle mb-3 pi-image">
 												<div class="d-flex" style="min-height: 160px">
 													{% block long_range_warning_animation %}
 														<div class="intro-banner-vdo-play-btn animation-color m-auto d-flex align-items-center justify-content-center">
@@ -106,7 +106,7 @@
 														With <b>short-range interactions</b>
 													</h6>
 													<br>
-													<img src="{{ get_url() }}/static/images/short_range_anim.png" class="align-middle mb-3 pi-image">
+													<img src="{{ get_url('/static/images') }}/short_range_anim.png" class="align-middle mb-3 pi-image">
 													<div class="d-flex" style="min-height: 160px">
 														{% block warning_animation %}
 															<div class="intro-banner-vdo-play-btn animation-color m-auto d-flex align-items-center justify-content-center">
@@ -609,7 +609,7 @@
 	<br><br><br>
 	<div id="disclaimer" style="border: #dee2e6 1px solid; margin: 1%; padding: 20px" class="rounded">
 		{% block disclaimer %}
-			<p class="image"> <img align="middle" src="{{ get_calculator_url() }}/static/images/disclaimer.jpg" width="40" height="40"><b>Disclaimer:</b><br><br></p>
+			<p class="image"> <img align="middle" src="{{ get_calculator_url('/static/images') }}/disclaimer.jpg" width="40" height="40"><b>Disclaimer:</b><br><br></p>
 			{{ text_blocks['Disclaimer'] }}
 		{% endblock disclaimer %}
 	</div>
diff --git a/caimira/apps/templates/base/index.html.j2 b/caimira/apps/templates/base/index.html.j2
index 2f2c5457..835bb7fa 100644
--- a/caimira/apps/templates/base/index.html.j2
+++ b/caimira/apps/templates/base/index.html.j2
@@ -4,8 +4,8 @@
 {% block main %}
 <header class= "bg-light">
   <div class="container container--padding">
-    <img src="{{ get_url() }}/static/images/caimira_full_text.png" class="logo d-block m-auto" id="desktop_logo">
-    <img src="{{ get_url() }}/static/images/caimira_full_logo.png" class="logo d-none m-auto" id="mobile_logo">
+    <img src="{{ get_url('/static/images') }}/caimira_full_text.png" class="logo d-block m-auto" id="desktop_logo">
+    <img src="{{ get_url('/static/images') }}/caimira_full_logo.png" class="logo d-none m-auto" id="mobile_logo">
   </div>
 </header>
    
@@ -20,7 +20,7 @@
           <p>
           CAiMIRA is a risk assessment tool developed to model the concentration of viruses in enclosed spaces, in order to inform space-management decisions.
           It does this by simulating the airborne spread SARS-CoV-2 virus in a finite volume, assuming homogenous mixing for the long-range component and a two-stage jet model for short-range, and estimates the risk of COVID-19 airborne transmission therein.
-          Please see the <a href="/about">About</a> page for more details on the methodology, assumptions and limitations of CAiMIRA.
+          Please see the <a href="{{ get_url('/about') }}">About</a> page for more details on the methodology, assumptions and limitations of CAiMIRA.
           </p>
           <p>
           The full CAiMIRA source code can be accessed freely under an Apache 2.0 open source license from our <a href="https://gitlab.cern.ch/caimira/caimira">code repository</a>.
@@ -38,7 +38,7 @@
       </div>
     </div>
     <div class="align-self-center">
-      <img src="{{ get_url() }}/static/images/CAiMIRA_1_Vs3_Colour.jpg" class="caimira_home_image">
+      <img src="{{ get_url('/static/images') }}/CAiMIRA_1_Vs3_Colour.jpg" class="caimira_home_image">
     </div>
   </div>
   
@@ -50,7 +50,7 @@
     </div>
     <div class="w-25 mobile-sub-section"><hr width="95%">
       <div class="d-flex m-2 align-items-center"><i class="bi bi-info-square-fill" style="font-size: 25px"></i><div><p class="paragraph-title ml-2">About</p></div></div>
-      <div class="m-2"><a href="{{ get_url() }}//about">About</a> page for details on methodology, assumptions and limitations of CAiMIRA.</div>
+      <div class="m-2"><a href="{{ get_url('/about') }}">About</a> page for details on methodology, assumptions and limitations of CAiMIRA.</div>
     </div>
     <div class="w-25 mobile-sub-section"><hr width="95%">
       <div class="d-flex m-2 align-items-center"><i class="bi bi-journal-text" style="font-size: 25px"></i><div><p class="paragraph-title ml-2">Documentation</p></div></div>
diff --git a/caimira/apps/templates/base/layout.html.j2 b/caimira/apps/templates/base/layout.html.j2
index f878feed..d279117f 100644
--- a/caimira/apps/templates/base/layout.html.j2
+++ b/caimira/apps/templates/base/layout.html.j2
@@ -14,10 +14,10 @@
   </title>
   
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" crossorigin="anonymous">
-  <link rel="stylesheet" href="{{ get_url() }}/static/css/style.css">
+  <link rel="stylesheet" href="{{ get_url('/static/css') }}/style.css">
   <link href="https://fonts.googleapis.com/css?family=Montserrat:300,400,500,600,700&display=swap" rel="stylesheet">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.9.1/font/bootstrap-icons.css">
-  <link rel="icon" type="image/x-icon" href="{{ get_url() }}/static/icons/favicon.ico">
+  <link rel="icon" type="image/x-icon" href="{{ get_url('/static/icons') }}/favicon.ico">
 
   {% block extra_headers %}
   {% endblock extra_headers %}
@@ -28,7 +28,7 @@
   <nav class="navbar navbar-dark navbar-expand-lg">
     <div class="container">
 
-      <a href="{{ get_url() }}" class="navbar-brand"><img src="{{ get_url() }}/static/images/caimira_logo_white_text.png" alt="Logo" title="Logo"></a>
+      <a href="{{ get_url() }}/" class="navbar-brand"><img src="{{ get_url('/static/images') }}/caimira_logo_white_text.png" alt="Logo" title="Logo"></a>
       
       <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
         <span class="navbar-toggler-icon"></span>
@@ -36,7 +36,7 @@
 
       <div class="collapse navbar-collapse" id="navbarResponsive">
         <ul class="navbar-nav ml-auto">
-          <li class="nav-link"><a href="/" class="{{ "header-navbar nav-link active" if "home/" == active_page else "header-navbar nav-link" }}">Home</a></li>
+          <li class="nav-link"><a href="{{ get_url() }}/" class="{{ "header-navbar nav-link active" if "home/" == active_page else "header-navbar nav-link" }}">Home</a></li>
           <div id="apps_dropdown">
             <li class="nav-item dropdown p-2">
               <a class="nav-link dropdown-toggle {{ "header-navbar nav-link active" if "calculator/" in active_page else "header-navbar nav-link" }}" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -55,7 +55,7 @@
           </div>
           {% block covid_information%}
           {% endblock covid_information%}
-          <li class="nav-link"><a href="/about" class="{{ "header-navbar nav-link active" if "about" == active_page else "header-navbar nav-link" }}">About</a></li>
+          <li class="nav-link"><a href="{{ get_url('/about') }}" class="{{ "header-navbar nav-link active" if "about" == active_page else "header-navbar nav-link" }}">About</a></li>
             {% if user.is_authenticated() %}
             <li class="nav-item dropdown p-2">
               <a class="nav-link active dropdown-toggle d-inline-block" href="https://cern.ch/users-portal" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -85,7 +85,7 @@
       <div class="row text-light text-center py-4 justify-content-center">
 
         <div class="col-sm-10 col-md-8 col-lg-6">
-          <img src="{{ get_url() }}/static/images/caimira_logo_white_text.png" alt="Logo">
+          <img src="{{ get_url('/static/images') }}/caimira_logo_white_text.png" alt="Logo">
           <p><span style="font-size:10px;"><em>CERN strives to deploy its know-how and technologies to help solve
                     the challenges arising in the local and global fight against COVID-19. As a particle physics
                     research organisation, CERN is not in a position to advise on medical research, health or health
@@ -103,10 +103,10 @@
     </div>
   </footer>
 
-  <script src="{{ get_url() }}/static/js/js_packaged_for_theme.js"></script>
+  <script src="{{ get_url('/static/js') }}/js_packaged_for_theme.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" integrity="sha512-bLT0Qm9VnAYZDflyKcBaQ2gg0hSYNQrJ8RilYldYQ1FxQYoCLtUjuuRuZo+fjqhx/qtq/1itJ0C2ejDxltZVFg==" crossorigin="anonymous"></script>
-  <script src="{{ get_url() }}/static/js/jquery.colorbox-min.js"></script>
-  <script src="{{ get_url() }}/static/js/ScrollMagic.min.js"></script>
+  <script src="{{ get_url('/static/js') }}/jquery.colorbox-min.js"></script>
+  <script src="{{ get_url('/static/js') }}/ScrollMagic.min.js"></script>
   <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/4.5.3/js/bootstrap.min.js" integrity="sha512-8qmis31OQi6hIRgvkht0s6mCOittjMa9GMqtK9hes5iEQBQE/Ca6yGE5FsW36vyipGoWQswBj/QBm2JR086Rkw==" crossorigin="anonymous"></script>
   <script src="{{ get_url() }}/static/js/usage-tracking.js"></script>
 
diff --git a/caimira/apps/templates/cern/calculator.report.html.j2 b/caimira/apps/templates/cern/calculator.report.html.j2
index 5176d5b2..d482b1dc 100644
--- a/caimira/apps/templates/cern/calculator.report.html.j2
+++ b/caimira/apps/templates/cern/calculator.report.html.j2
@@ -181,7 +181,7 @@
               <div class="alert alert-warning" role="alert">Events with a <strong>P(i) between 2% and 10%</strong> shall be subject to ALARA principles (see footnote) to minimise the risk before proceeding.</div>
               <div class="alert alert-danger mb-0" role="alert">Events with a <strong>P(i) exceeding 10% or a number of expected new cases that exceeds 1</strong> may not take place until additional measures are in place and a risk reduction has been performed.</div>
             </div>
-            <div class="col-xl-3 align-self-center text-center"><img id="scale_warning" class="rounded" src="{{ get_calculator_url() }}/static/images/warning_scale/{{ cern_level }}.png"></div>
+            <div class="col-xl-3 align-self-center text-center"><img id="scale_warning" class="rounded" src="{{ get_calculator_url('/static/images/warning_scale') }}/{{ cern_level }}.png"></div>
           </div>
         </div>
         <br>