diff --git a/plinth/modules/firewall/templates/firewall.html b/plinth/modules/firewall/templates/firewall.html
index 34684d595..08fc08ba9 100644
--- a/plinth/modules/firewall/templates/firewall.html
+++ b/plinth/modules/firewall/templates/firewall.html
@@ -43,47 +43,51 @@ firewalld'</p>
 
 {% else %}
 
-<table class='table table-autowidth'>
-  <thead>
-    <th>Service/Port</th>
-    <th>Status</th>
-  </thead>
+<div class="row">
+  <div class="col-sm-8">
+    <table class='table table-autowidth table-striped'>
+      <thead>
+        <th>Service/Port</th>
+        <th>Status</th>
+      </thead>
 
-  <tbody>
-    {% for service in services %}
-      <tr>
-        <td><strong>{{ service.name }}</strong></td>
-        <td>
-          {% if service.is_enabled %}
-            <span class='label label-success'>Enabled</span>
-          {% else %}
-            <span class='label label-important'>Disabled</span>
-          {% endif %}
-        </td>
-      </tr>
+      <tbody>
+        {% for service in services %}
+          <tr>
+            <td><strong>{{ service.name }}</strong></td>
+            <td>
+              {% if service.is_enabled %}
+                <span class='label label-success'>Enabled</span>
+              {% else %}
+                <span class='label label-important'>Disabled</span>
+              {% endif %}
+            </td>
+          </tr>
 
-      {% for port in service.ports %}
-        <tr>
-          <td class='cell-indented'><em>{{ port }}</em></td>
-          <td>
-            {% if port in internal_enabled_services and port in external_enabled_services %}
-              <span class='label label-success'>Permitted</span>
-            {% elif port in internal_enabled_services %}
-              <span class='label label-warning'>Permitted (internal only)</span>
-            {% elif port in external_enabled_services %}
-              <span class='label label-warning'>Permitted (external only)</span>
-            {% else %}
-              <span class='label label-important'>Blocked</span>
-            {% endif %}
-          </td>
-        </tr>
-      {% endfor %}
+          {% for port in service.ports %}
+            <tr>
+              <td class='cell-indented'><em>{{ port }}</em></td>
+              <td>
+                {% if port in internal_enabled_services and port in external_enabled_services %}
+                  <span class='label label-success'>Permitted</span>
+                {% elif port in internal_enabled_services %}
+                  <span class='label label-warning'>Permitted (internal only)</span>
+                {% elif port in external_enabled_services %}
+                  <span class='label label-warning'>Permitted (external only)</span>
+                {% else %}
+                  <span class='label label-important'>Blocked</span>
+                {% endif %}
+              </td>
+            </tr>
+          {% endfor %}
 
-    {% endfor %}
+        {% endfor %}
 
-  </tbody>
+      </tbody>
 
-</table>
+    </table>
+  </div>
+</div>
 
 <p><em>The operation of the firewall is automatic. When you enable a
 service it is automatically permitted in the firewall and you disable
diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index 663ee792c..c7341ed71 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -56,14 +56,17 @@ can help circumvent censorship. If your {{ cfg.box_name }} is behind a router
 or firewall, you should make sure the following ports are open, and
 port-forwarded, if necessary:</p>
 
-<table class="table table-bordered table-condensed" style="width:300px">
-  {% for name, port in tor_ports.items %}
-    <tr>
-      <td>{{ name }}</td>
-      <td>{{ port }}</td>
-    </tr>
-  {% endfor %}
-</table>
+<div class="col-sm-3">
+  <table class="table table-bordered table-condensed">
+    {% for name, port in tor_ports.items %}
+      <tr>
+        <td>{{ name }}</td>
+        <td>{{ port }}</td>
+      </tr>
+    {% endfor %}
+  </table>
+</div>
+
 <br style='clear:both'>
 
 <h3>SOCKS</h3>