diff --git a/caimira/apps/calculator/static/js/form.js b/caimira/apps/calculator/static/js/form.js
index 20c0b5b4..86c23880 100644
--- a/caimira/apps/calculator/static/js/form.js
+++ b/caimira/apps/calculator/static/js/form.js
@@ -1309,7 +1309,7 @@ vaccine_primary_host_immunity = [
 ]
 
 vaccine_booster_host_immunity = [
-  {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'AZD1222_(AstraZeneca),'},
+  {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'AZD1222_(AstraZeneca)',},
   {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'BNT162b2_(Pfizer)',},
   {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'BNT162b2_(Pfizer)_or_mRNA-1273_(Moderna)',},
   {'primary series vaccine': 'AZD1222_(AstraZeneca)', 'booster vaccine': 'mRNA-1273_(Moderna)',},
diff --git a/caimira/apps/templates/base/calculator.form.html.j2 b/caimira/apps/templates/base/calculator.form.html.j2
index c1fad444..5959d555 100644
--- a/caimira/apps/templates/base/calculator.form.html.j2
+++ b/caimira/apps/templates/base/calculator.form.html.j2
@@ -58,7 +58,7 @@
 
     <b>Virus data:</b>
 
-    <div data-tooltip="Choose the SARS-CoV-2 Variant of Concern (VOC).">
+    <div data-tooltip="Choose the SARS-CoV-2 Variant of Concern (VOC) and select the vaccine type taken by the majority of the exposed population.">
         <span class="tooltip_text">?</span>
     </div><br>
 
@@ -76,6 +76,49 @@
     </div>
     </div>
 
+    <div class="form-group row">
+      <div class="col-sm-4">Vaccinated? 💉</div>
+      <div class="col-sm-6 ml-0">
+        <input type="radio" id="vaccinated_no" name="vaccine_option" value="0" checked="checked">
+          <label class="mb-0" for="vaccinated_no">No</label>
+        <input class="ml-2" type="radio" id="vaccinated_yes" name="vaccine_option" value="1" data-enables="#DIVvaccine_booster">
+          <label class="mb-0" for="vaccinated_yes">Yes</label>
+      </div>
+    </div>
+
+    <div id="DIVvaccine_booster" class="mt-3">
+      <div class="form-group row">
+      <div class="col-sm-4"><label class="col-form-label">Primary vaccine:</label></div>
+      <div class="col-sm-6 align-self-center">
+        <select id="vaccine_type" name="vaccine_type" class="form-control form-control-sm">
+          {# Updated with JS #}
+        </select>
+      </div>
+      </div>
+
+      <div class="form-group row">
+      <div class="d-flex flex-row col-sm-4"><div class="ml-4" style="border: 1px solid #2f4858"></div><p class="ml-2">With booster?</p></div>
+      <div class="col-sm-6 ml-0">
+        <input type="radio" id="vaccinated_booster_no" name="vaccine_booster_option" value="0" checked="checked">
+          <label class="mb-0" for="vaccinated_booster_no">No</label>
+        <input class="ml-2" type="radio" id="vaccinated_booster_yes" name="vaccine_booster_option" value="1" data-enables="#DIVvaccine_booster_yes">
+          <label class="mb-0" for="vaccinated_booster_yes">Yes</label>
+      </div>
+      </div>
+      
+      <div id="DIVvaccine_booster_yes" class="mt-3">
+        <div class="form-group row">
+        <div class="col-sm-4"><label class="col-form-label">Booster:</label></div>
+        <div class="col-sm-6 align-self-center">
+          <select id="vaccine_booster_type" name="vaccine_booster_type" class="form-control form-control-sm">
+            {# Updated with JS #}
+          </select> 
+        </div>
+        </div>
+        <p id="booster_warning" class="red_text" style="display: none; max-width: 85%">Due to the lack of data, only the efficiency of the primary dose(s) is considered</p>
+      </div>
+    </div>
+
     <hr width="80%">
 
     <b>Room data:</b>
@@ -325,7 +368,7 @@
     <input type="radio" id="p_deterministic_exposure" name="exposure_option" value="p_deterministic_exposure" checked="checked" data-enables="#DIVp_deterministic_exposure">
       <label for="p_deterministic_exposure">Deterministic exposure</label>
     </div>
-    <div class="form-group">
+    <div class="form-group mb-1">
     <input type="radio" id="p_probabilistic_exposure"  name="exposure_option" value="p_probabilistic_exposure" data-enables="#DIVp_probabilistic_exposure">
       <label for="p_probabilistic_exposure">Probabilistic exposure (incidence rate)</label>
     </div>
@@ -359,48 +402,6 @@
     </div>
 
     <span id="training_limit_error" class="red_text" hidden>Conference/Training activities limited to 1 infected<br></span>
-    <div class="form-group row">
-      <div class="col-sm-4">Vaccinated? 💉</div>
-      <div class="col-sm-6 ml-0">
-        <input type="radio" id="vaccinated_no" name="vaccine_option" value="0" checked="checked">
-          <label class="mb-0" for="vaccinated_no">No</label>
-        <input class="ml-2" type="radio" id="vaccinated_yes" name="vaccine_option" value="1" data-enables="#DIVvaccine_booster">
-          <label class="mb-0" for="vaccinated_yes">Yes</label>
-      </div>
-    </div>
-
-    <div id="DIVvaccine_booster" class="mt-3">
-      <div class="form-group row">
-      <div class="col-sm-4"><label class="col-form-label">Primary vaccine:</label></div>
-      <div class="col-sm-6 align-self-center">
-        <select id="vaccine_type" name="vaccine_type" class="form-control form-control-sm">
-          {# Updated with JS #}
-        </select>
-      </div>
-      </div>
-
-      <div class="form-group row">
-      <div class="d-flex flex-row col-sm-4"><div class="ml-4" style="border: 1px solid #2f4858"></div><p class="ml-2">With booster?</p></div>
-      <div class="col-sm-6 ml-0">
-        <input type="radio" id="vaccinated_booster_no" name="vaccine_booster_option" value="0" checked="checked">
-          <label class="mb-0" for="vaccinated_booster_no">No</label>
-        <input class="ml-2" type="radio" id="vaccinated_booster_yes" name="vaccine_booster_option" value="1" data-enables="#DIVvaccine_booster_yes">
-          <label class="mb-0" for="vaccinated_booster_yes">Yes</label>
-      </div>
-      </div>
-      
-      <div id="DIVvaccine_booster_yes" class="mt-3">
-        <div class="form-group row">
-        <div class="col-sm-4"><label class="col-form-label">Booster:</label></div>
-        <div class="col-sm-6 align-self-center">
-          <select id="vaccine_booster_type" name="vaccine_booster_type" class="form-control form-control-sm">
-            {# Updated with JS #}
-          </select> 
-        </div>
-        </div>
-        <p id="booster_warning" class="red_text" style="display: none; max-width: 85%">Due to the lack of data, only the efficiency of the primary dose(s) is considered</p>
-      </div>
-    </div>
 
     <hr width="80%">
 
diff --git a/caimira/apps/templates/base/userguide.html.j2 b/caimira/apps/templates/base/userguide.html.j2
index 14929ff9..95a2361d 100644
--- a/caimira/apps/templates/base/userguide.html.j2
+++ b/caimira/apps/templates/base/userguide.html.j2
@@ -51,6 +51,11 @@ The local population in Manaus had very high levels of Covid-19 antibodies (&gt;
 This factor has been taken into account by the authors of the study, via statistical adjustments to the transmission value (i.e. it has been increased, to account for spread in a population with significant acquired Covid-19 immunity).
 However, this value may be revised in the future as more studies of the Gamma VOC transmission in different geographical locations become available.</p>
 <br>
+<h4>Vaccine effectiveness</h4>
+<br>
+<p>The vaccination input corresponds to the vaccine type(s) administrated to the exposed population, assuming every exposed (or the occupant in question) has received the vaccine cocktail selected by the user. 
+The respective vaccine effectiveness values were extracted from data available in <a href="https://view-hub.org/resources">Results of COVID-19 Vaccine Effectiveness Studies: An Ongoing Systematic Review - Updated September 8, 2022</a>, using <a href="https://gitlab.cern.ch/cara/caimira/-/tree/master/caimira/scripts/data/vaccine_effectiveness.py">this script</a>.</p>
+<br>
 <h3>Room Data</h3>
 <br>
 <p>Please enter either the room volume (in m³) or both the floor area (m²) and the room height (m).
diff --git a/setup.cfg b/setup.cfg
index c2f968b6..46f08728 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,3 +29,5 @@ ignore_missing_imports = True
 [mypy-timezonefinder.*]
 ignore_missing_imports = True
 
+[mypy-pandas.*]
+ignore_missing_imports = True