diff --git a/swh/web/templates/add_forge_now/common.html b/swh/web/templates/add_forge_now/common.html
--- a/swh/web/templates/add_forge_now/common.html
+++ b/swh/web/templates/add_forge_now/common.html
@@ -23,36 +23,46 @@
 {% endblock %}
 
 {% block content %}
-<div class="col-md-12 offset-md-1">
-  <div class="col-md-8">
-    <h5 class="d-flex justify-content-between align-items-center mb-3">
-    </h5>
-    <p style="margin-top: 1rem;">
-      “Add forge now” provides a service for Software Heritage users to save a
-      complete forge in the Software Heritage archive by requesting the addition
-      of the forge URL into the list of regularly visited forges.
-      {% if not user.is_authenticated %}
-      <p>
-        You can submit an “Add forge now” request only when you are authenticated,
-        please login to submit the request.
-      </p>
-      {% endif %}
+<div class="row mt-3">
+  <p>
+    “Add forge now” provides a service for Software Heritage users to save a
+    complete forge in the Software Heritage archive by requesting the addition
+    of the forge URL into the list of regularly visited forges.
+  </p>
+  {% if not user.is_authenticated %}
+    <p>
+      You can submit an “Add forge now” request only when you are authenticated,
+      please login to submit the request.
     </p>
-  </div>
-
-  <!-- Tabs in the page -->
-  <div class="col-md-8">
-    <ul class="nav nav-tabs">
-      <li class="nav-item"><a class="nav-link {% if request.resolver_match.view_name == 'forge-add-create' %}active{% endif %}" href="{% url 'forge-add-create' %}" id="swh-add-forge-tab">Submit a Request</a></li>
-      <li class="nav-item"><a class="nav-link {% if request.resolver_match.view_name == 'forge-add-list' %}active{% endif %}" href="{% url 'forge-add-list' %}" id="swh-add-forge-requests-list-tab">Browse Requests</a></li>
-      <li class="nav-item"><a class="nav-link {% if request.resolver_match.view_name == 'forge-add-help' %}active{% endif %}" href="{% url 'forge-add-help' %}" id="swh-add-forge-requests-help-tab">Help</a></li>
-    </ul>
-
-    <div class="tab-content">
-      {% block tab_content %}
-      {% endblock %}
-    </div>
-  </div>
+  {% endif %}
+</div>
+
+<!-- Tabs in the page -->
+<ul class="nav nav-tabs">
+  <li class="nav-item">
+    <a class="nav-link {% if request.resolver_match.view_name == 'forge-add-create' %}active{% endif %}"
+       href="{% url 'forge-add-create' %}" id="swh-add-forge-tab">
+      Submit a Request
+    </a>
+  </li>
+  <li class="nav-item">
+    <a class="nav-link {% if request.resolver_match.view_name == 'forge-add-list' %}active{% endif %}"
+       href="{% url 'forge-add-list' %}" id="swh-add-forge-requests-list-tab">
+      Browse Requests
+    </a>
+  </li>
+  <li class="nav-item">
+    <a class="nav-link {% if request.resolver_match.view_name == 'forge-add-help' %}active{% endif %}"
+       href="{% url 'forge-add-help' %}" id="swh-add-forge-requests-help-tab">
+      Help
+    </a>
+  </li>
+</ul>
+
+<div class="tab-content">
+  {% block tab_content %}
+  {% endblock %}
+</div>
 
 <script>
   swh.add_forge.onCreateRequestPageLoad();
diff --git a/swh/web/templates/add_forge_now/creation_form.html b/swh/web/templates/add_forge_now/creation_form.html
--- a/swh/web/templates/add_forge_now/creation_form.html
+++ b/swh/web/templates/add_forge_now/creation_form.html
@@ -8,9 +8,8 @@
 {% endcomment %}
 
 {% block tab_content %}
-  <div id="swh-add-forge-submit-request" class="tab-pane active" style="padding-top: 10px;">
+  <div id="swh-add-forge-submit-request" class="tab-pane active mt-3">
     {% if not user.is_authenticated %}
-    <h3>
       <p class="text-primary">
         You must be logged in to submit an add forge request. Please
         <a id="loginLink" class="link-primary"
@@ -18,99 +17,113 @@
           href="{% url 'oidc-login' %}?next={% url 'forge-add-create' %}"
         {% else %}
           href="{% url 'login' %}?next={% url 'forge-add-create' %}"
-        {% endif %}
-        >log in</a>
+        {% endif %}>log in</a>
       </p>
-    </h3>
     {% else %}
 
-    <form method="POST" action="{% url 'api-1-add-forge-request-create' %}"
-          id="requestCreateForm" class="collapse show">
-      {% csrf_token %}
-      <div class="form-row">
-        <div class="form-group col-md-5">
-          <label for="swh-input-forge-type" class="swh-required-label">Forge type</label>
-          <select class="form-control" id="swh-input-forge-type" name="forge_type" autofocus>
-            {% for forge_type in forge_types %}
-            <option value={{ forge_type }}>{{ forge_type}}</option>
-            {% endfor %}
-          </select>
-          <small class="form-text text-muted">
-            Supported forge types in software archive.
-          </small>
-        </div>
+      <form method="POST" action="{% url 'api-1-add-forge-request-create' %}"
+            id="requestCreateForm" class="collapse show">
+        {% csrf_token %}
+        <div class="form-row">
+          <div class="form-group col-md-5">
+            <label for="swh-input-forge-type" class="swh-required-label">
+              Forge type
+            </label>
+            <select class="form-control" id="swh-input-forge-type"
+                    name="forge_type" autofocus>
+              {% for forge_type in forge_types %}
+              <option value={{ forge_type }}>{{ forge_type}}</option>
+              {% endfor %}
+            </select>
+            <small class="form-text text-muted">
+              Supported forge types in software archive.
+            </small>
+          </div>
 
-        <div class="form-group col-md-7">
-          <label for="swh-input-forge-url" class="swh-required-label">Forge URL</label>
-          <input type="text" class="form-control" id="swh-input-forge-url" name="forge_url" required>
-          <small class="form-text text-muted">
-            Remote URL of the forge.
-          </small>
+          <div class="form-group col-md-7">
+            <label for="swh-input-forge-url" class="swh-required-label">
+              Forge URL
+            </label>
+            <input type="text" class="form-control" id="swh-input-forge-url"
+                   name="forge_url" required>
+            <small class="form-text text-muted">
+              Remote URL of the forge.
+            </small>
+          </div>
         </div>
-      </div>
 
-      <div class="form-row">
-        <div class="form-group col-md-5">
-          <label for="swh-input-forge-contact-name" class="swh-required-label">Forge contact name</label>
-          <input type="text" class="form-control" name="forge_contact_name" id="swh-input-forge-contact-name" required>
-          <small class="form-text text-muted">
-            Name of the forge administrator.
-          </small>
-        </div>
+        <div class="form-row">
+          <div class="form-group col-md-5">
+            <label for="swh-input-forge-contact-name" class="swh-required-label">
+              Forge contact name
+            </label>
+            <input type="text" class="form-control" name="forge_contact_name"
+                   id="swh-input-forge-contact-name" required>
+            <small class="form-text text-muted">
+              Name of the forge administrator.
+            </small>
+          </div>
 
-        <div class="form-group col-md-7">
-          <label for="swh-input-forge-contact-email" class="swh-required-label">Forge contact email</label>
-          <input type="email" class="form-control" name="forge_contact_email" id="swh-input-forge-contact-email" required>
-          <small class="form-text text-muted">
-            Email of the forge administrator. The given email address will not be used for any purpose outside the “add forge now” process.
-          </small>
+          <div class="form-group col-md-7">
+            <label for="swh-input-forge-contact-email" class="swh-required-label">
+              Forge contact email
+            </label>
+            <input type="email" class="form-control" name="forge_contact_email"
+                   id="swh-input-forge-contact-email" required>
+            <small class="form-text text-muted">
+              Email of the forge administrator. The given email address will not be used
+              for any purpose outside the “add forge now” process.
+            </small>
+          </div>
         </div>
-      </div>
 
-      <div class="form-row">
-        <div class="form-group form-check">
-          <input class="form-check-input" type="checkbox"
-                 id="swh-input-consent-check" name="submitter_forward_username">
-          <label for="swh-input-consent-check">
-            I consent to add my username in the communication with the forge.
-          </label>
+        <div class="form-row">
+          <div class="form-group form-check">
+            <input class="form-check-input" type="checkbox"
+                  id="swh-input-consent-check" name="submitter_forward_username">
+            <label for="swh-input-consent-check">
+              I consent to add my username in the communication with the forge.
+            </label>
+          </div>
         </div>
-      </div>
 
-      <div class="form-row">
-        <div class="form-group col-md-12">
-          <label for="swh-input-forge-comment">Comment</label>
-          <textarea class="form-control" id="swh-input-forge-comment" name="forge_contact_comment" rows="3"></textarea>
-          <small class="form-text text-muted">
-            Optionally, leave a comment to the moderator regarding your request.
-          </small>
+        <div class="form-row">
+          <div class="form-group col-md-12">
+            <label for="swh-input-forge-comment">Comment</label>
+            <textarea class="form-control" id="swh-input-forge-comment"
+                      name="forge_contact_comment" rows="3">
+            </textarea>
+            <small class="form-text text-muted">
+              Optionally, leave a comment to the moderator regarding your request.
+            </small>
+          </div>
         </div>
-      </div>
 
-      <div class="form-row">
-        <div class="col-md-12">
-          <input id="swh-input-form-submit" type="submit" value="Submit Add Request" class="btn btn-default float-right">
+        <div class="form-row">
+          <div class="col-md-12">
+            <input id="swh-input-form-submit" type="submit" value="Submit Add Request"
+                   class="btn btn-default float-right">
+          </div>
         </div>
-      </div>
 
-      <div class="form-row">
-        <div class="col-md-12">
-          <h3 class="text-center">
-            <span id="userMessage" class="badge"></span>
-          </h3>
-          <p class="text-center">
-            <span id="userMessageDetail"></span>
-          </p>
+        <div class="form-row">
+          <div class="col-md-12">
+            <h3 class="text-center">
+              <span id="userMessage" class="badge"></span>
+            </h3>
+            <p class="text-center">
+              <span id="userMessageDetail"></span>
+            </p>
+          </div>
         </div>
-      </div>
-    </form>
-    <p>
-      Once an add-forge-request is submitted, its status can be viewed in
-      the <a id="swh-show-forge-add-requests-list" href="#browse-requests">
-      submitted requests list</a>. This process involves a moderator approval and
-      might take a few days to handle (it primarily depends on the response
-      time from the forge).
-    </p>
+      </form>
+      <p>
+        Once an add-forge-request is submitted, its status can be viewed in
+        the <a id="swh-show-forge-add-requests-list" href="#browse-requests">
+        submitted requests list</a>. This process involves a moderator approval and
+        might take a few days to handle (it primarily depends on the response
+        time from the forge).
+      </p>
     {% endif %}
   </div>
 {% endblock %}
diff --git a/swh/web/templates/add_forge_now/help.html b/swh/web/templates/add_forge_now/help.html
--- a/swh/web/templates/add_forge_now/help.html
+++ b/swh/web/templates/add_forge_now/help.html
@@ -8,8 +8,8 @@
 {% endcomment %}
 
 {% block tab_content %}
-  <div id="swh-add-forge-requests-help" class="tab-pane active">
-    <p style="margin-top: 1rem;">
+  <div id="swh-add-forge-requests-help" class="tab-pane active mt-3">
+    <p>
       For submitting an "Add forge now" request", you have to provide the following details:
     </p>
     <ul>
@@ -38,7 +38,7 @@
       their request to the add-forge-now moderator.
       </li>
     </ul>
-    <p style="margin-top: 1rem;">
+    <p class="mt-1">
       Once submitted, your "add forge" request can be in one
       of the following states
     </p>
diff --git a/swh/web/templates/add_forge_now/list.html b/swh/web/templates/add_forge_now/list.html
--- a/swh/web/templates/add_forge_now/list.html
+++ b/swh/web/templates/add_forge_now/list.html
@@ -8,8 +8,8 @@
 {% endcomment %}
 
 {% block tab_content %}
-  <div id="swh-add-forge-requests-list" class="tab-pane active">
-    <table id="add-forge-request-browse" class="table swh-table swh-table-striped" style="width: 100%;">
+  <div id="swh-add-forge-requests-list" class="tab-pane active mt-3" style="width: 100%;">
+    <table id="add-forge-request-browse" class="table swh-table swh-table-striped">
       <thead>
         <tr>
           <th>Submission date</th>
diff --git a/swh/web/templates/add_forge_now/request-dashboard.html b/swh/web/templates/add_forge_now/request-dashboard.html
--- a/swh/web/templates/add_forge_now/request-dashboard.html
+++ b/swh/web/templates/add_forge_now/request-dashboard.html
@@ -27,14 +27,14 @@
     <h3>Error fetching information about the request</h3>
   </div>
   <div class="row" id="requestDetails">
-    <div id="ForgeRequestActions" class="col-md-8 request-actions">
+    <div id="ForgeRequestActions" class="request-actions">
       <div>
         <div class="accordion" id="requestHistory">
         </div>
       </div>
       <div>
         <form method="POST"
-                action="{% url 'api-1-add-forge-request-update' request_id %}"
+              action="{% url 'api-1-add-forge-request-update' request_id %}"
               style="padding-top: 5px;" id="updateRequestForm">
             {% csrf_token %}
             <div class="form-row">
@@ -55,7 +55,7 @@
               </div>
             </div>
             <div class="form-group col-md-6">
-              <button type="submit" class="btn btn-default mb-2 btn-lg">Submit</button>
+              <button type="submit" class="btn btn-default mb-2">Submit</button>
             </div>
 
             <div class="form-row">
diff --git a/swh/web/templates/add_forge_now/requests-moderation.html b/swh/web/templates/add_forge_now/requests-moderation.html
--- a/swh/web/templates/add_forge_now/requests-moderation.html
+++ b/swh/web/templates/add_forge_now/requests-moderation.html
@@ -21,8 +21,8 @@
 {% endblock %}
 
 {% block content %}
-<div class="col-md-8 offset-md-1">
-  <div id="swh-add-forge-requests-list">
+<div class="row">
+  <div id="swh-add-forge-requests-list" style="width: 100%;">
     <table id="swh-add-forge-now-moderation-list" class="table swh-table swh-table-striped">
       <thead>
         <tr>