diff --git a/application/Espo/Resources/i18n/en_US/Admin.json b/application/Espo/Resources/i18n/en_US/Admin.json
index 83d5e01948..54f8fdb1c7 100644
--- a/application/Espo/Resources/i18n/en_US/Admin.json
+++ b/application/Espo/Resources/i18n/en_US/Admin.json
@@ -75,6 +75,7 @@
         "Layout Sets": "Layout Sets",
         "Success": "Success",
         "Fail": "Fail",
+        "Configuration Instructions": "Configuration Instructions",
         "is recommended": "is recommended",
         "extension is missing": "extension is missing"
     },
diff --git a/client/res/templates/admin/system-requirements/index.tpl b/client/res/templates/admin/system-requirements/index.tpl
index ee4e55dbe3..d7e546a82c 100644
--- a/client/res/templates/admin/system-requirements/index.tpl
+++ b/client/res/templates/admin/system-requirements/index.tpl
@@ -1,23 +1,27 @@
-<div class="page-header"><h3><a href="#Admin">{{translate 'Administration'}}</a> 
+<div class="page-header"><h3><a href="#Admin">{{translate 'Administration'}}</a>
 <span class="breadcrumb-separator"><span class="chevron-right"></span></span>
 {{translate 'System Requirements' scope='Admin'}}</h3></div>
 
 <div class="panel panel-default">
-    <table class="table table-striped">
+    <table class="table table-striped table-no-overflow table-fixed">
         <thead>
             <tr>
-                <th colspan="3">{{translate 'PHP Settings' scope='Admin'}}</th>
+                <th><h5>{{translate 'PHP Settings' scope='Admin'}}</h5></th>
+                <th width="24%"></th>
+                <th width="24%"></th>
             </tr>
         </thead>
         <tbody>
             {{#each phpRequirementList}}
                 <tr class="list-row">
-                    <td class="cell col-md-5">
+                    <td class="cell">
                         {{translate @key scope='Admin' category='systemRequirements'}}
                     </td>
-                    <td class="cell col-md-3">{{actual}}</td>
-                    <td class="cell col-md-4">
-                        {{#if acceptable}} <span class="text-success">{{translate 'Success' scope='Admin'}}</span> {{else}} <span class="text-danger">{{translate 'Fail' scope='Admin'}}
+                    <td class="cell">{{actual}}</td>
+                    <td class="cell">
+                        {{#if acceptable}} <span class="text-success">{{translate 'Success' scope='Admin'}}</span>
+                        {{else}}
+                        <span class="text-danger">{{translate 'Fail' scope='Admin'}}
                             {{#ifEqual type 'lib'}} ({{translate 'extension is missing' scope='Admin'}}) {{/ifEqual}}
                             {{#ifEqual type 'param'}} ({{required}} {{translate 'is recommended' scope='Admin'}}) {{/ifEqual}}
                         </span> {{/if}}
@@ -29,23 +33,29 @@
 </div>
 
 <div class="panel panel-default">
-    <table class="table table-striped">
+    <table class="table table-striped table-no-overflow table-fixed">
         <thead>
             <tr>
-                <th colspan="3">{{translate 'Database Settings' scope='Admin'}}</th>
+                <th><h5>{{translate 'Database Settings' scope='Admin'}}</h5></th>
+                <th width="24%"></th>
+                <th width="24%"></th>
             </tr>
         </thead>
         <tbody>
             {{#each databaseRequirementList}}
-                <tr class="list-row">
-                    <td class="cell col-md-5">
+                <tr class="">
+                    <td class="cell">
                         {{translate @key scope='Admin' category='systemRequirements'}}
                     </td>
-                    <td class="cell col-md-3">{{actual}}</td>
-                    <td class="cell col-md-5">
-                        {{#if acceptable}} <span class="text-success">{{translate 'Success' scope='Admin'}}</span> {{else}} <span class="text-danger">{{translate 'Fail' scope='Admin'}}
+                    <td class="cell" width="24%">{{actual}}</td>
+                    <td class="cell" width="24%">
+                        {{#if acceptable}}
+                        <span class="text-success">{{translate 'Success' scope='Admin'}}</span>
+                        {{else}}
+                        <span class="text-danger">{{translate 'Fail' scope='Admin'}}
                             {{#ifEqual type 'param'}} ({{required}} {{translate 'is recommended' scope='Admin'}}) {{/ifEqual}}
-                        </span> {{/if}}
+                        </span>
+                        {{/if}}
                     </td>
                 </tr>
             {{/each}}
@@ -54,21 +64,27 @@
 </div>
 
 <div class="panel panel-default">
-    <table class="table table-striped">
+    <table class="table table-striped table-no-overflow table-fixed">
         <thead>
             <tr>
-                <th colspan="3">{{translate 'Permissions' scope='Admin'}}</th>
+                <th><h5>{{translate 'Permissions' scope='Admin'}}</h5></th>
+                <th width="24%"></th>
+                <th width="24%"></th>
             </tr>
         </thead>
         <tbody>
             {{#each permissionRequirementList}}
-                <tr class="list-row">
-                    <td class="cell col-md-5">
+                <tr>
+                    <td class="cell">
                         {{translate @key scope='Admin' category='systemRequirements'}}
                     </td>
-                    <td class="cell col-md-3">{{translate type scope='Admin' category='systemRequirements'}}</td>
-                    <td class="cell col-md-4">
-                        {{#if acceptable}} <span class="text-success">{{translate 'Success' scope='Admin'}}</span> {{else}} <span class="text-danger">{{translate 'Fail' scope='Admin'}}</span> {{/if}}
+                    <td class="cell" width="24%">{{translate type scope='Admin' category='systemRequirements'}}</td>
+                    <td class="cell" width="24%">
+                        {{#if acceptable}}
+                        <span class="text-success">{{translate 'Success' scope='Admin'}}</span>
+                        {{else}}
+                        <span class="text-danger">{{translate 'Fail' scope='Admin'}}</span>
+                        {{/if}}
                     </td>
                 </tr>
             {{/each}}
@@ -79,7 +95,10 @@
 <div class="row">
     <div class="col-md-12">
         <div class="pull-right">
-            <a target="_blank" href="https://www.espocrm.com/documentation/administration/server-configuration/" style="font-weight:600;">Configuration Instructions</a>
+            <a
+                target="_blank"
+                href="https://docs.espocrm.com/administration/server-configuration/"
+            ><strong>{{translate 'Configuration Instructions' scope='Admin'}}</strong></a>
         </div>
     </div>
 </div>
diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less
index 6e9e728c8d..3976236ecb 100644
--- a/frontend/less/espo/custom.less
+++ b/frontend/less/espo/custom.less
@@ -897,6 +897,10 @@ table.table > tbody td > .list-row-buttons button {
     }
 }
 
+table.table-fixed {
+    table-layout: fixed;
+}
+
 .list-row-buttons span.caret {
     border-top-color: @gray-light;
 }