diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32b91515..3c6c3ae3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,38 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.18.0] - 2023-03-30
 ### Added
-- Footer to all pages. [#1044](https://github.com/rokwire/rokwire-building-blocks-api/issues/1044)
-- Input validation for contribute create page. [#1103](https://github.com/rokwire/rokwire-building-blocks-api/issues/1103)
 
 ### Changed
-- UI for capability view page. [#1034](https://github.com/rokwire/rokwire-building-blocks-api/issues/1034)
-- Updated footer UI. [#1036](https://github.com/rokwire/rokwire-building-blocks-api/issues/1036)
-- UI changes to top navigation bar. [#1040](https://github.com/rokwire/rokwire-building-blocks-api/issues/1040)
-- UI for talent view page. [#1060](https://github.com/rokwire/rokwire-building-blocks-api/issues/1060)
-- UI changes for contribution details page. [#1041](https://github.com/rokwire/rokwire-building-blocks-api/issues/1041)
-- Catalog home page UI. [#1063](https://github.com/rokwire/rokwire-building-blocks-api/issues/1063)
-- CODEOWNERS file to include CHANGELOG. [#1059](https://github.com/rokwire/rokwire-building-blocks-api/issues/1059)
-- Create contribution page UI. [#1065](https://github.com/rokwire/rokwire-building-blocks-api/issues/1065)
-- Review block in contribution details page. [#1066](https://github.com/rokwire/rokwire-building-blocks-api/issues/1066)
-- Rearranged divs in contribute page. [#1079](https://github.com/rokwire/rokwire-building-blocks-api/issues/1079)
-- Element stylings in contribute page. [#1087](https://github.com/rokwire/rokwire-building-blocks-api/issues/1087)
-- Cryptography version bump for contributions. [#1089](https://github.com/rokwire/rokwire-building-blocks-api/issues/1089)
-- Cryptography version bump for appconfigservice. [#1089](https://github.com/rokwire/rokwire-building-blocks-api/issues/1100)
-- Catalog home page card alignment. [#1084](https://github.com/rokwire/rokwire-building-blocks-api/issues/1084)
-- Updated button styles to match design. [#1085](https://github.com/rokwire/rokwire-building-blocks-api/issues/1085)
-- Update werkzeug version in catalog. [#1099](https://github.com/rokwire/rokwire-building-blocks-api/issues/1099)
-- Custom dropdown menu style. [#1090](https://github.com/rokwire/rokwire-building-blocks-api/issues/1090)
-- Fill footer at the bottom of pages. [#1092](https://github.com/rokwire/rokwire-building-blocks-api/issues/1092)
-- Contribute form field labels and placeholders. [#1102](https://github.com/rokwire/rokwire-building-blocks-api/issues/1102)
-- Wordings of view pages. [#1069](https://github.com/rokwire/rokwire-building-blocks-api/issues/1069)
+- UI table spacing for details pages. [#1117](https://github.com/rokwire/rokwire-building-blocks-api/issues/1117)
 
 ### Fixed
-- Detect secrets GitHub action build error and updated baseline. [#1077](https://github.com/rokwire/rokwire-building-blocks-api/issues/1077)
-- Overlapping divs in catalog contribute create page. [#1054](https://github.com/rokwire/rokwire-building-blocks-api/issues/1054)
 
-## [1.17.0] - 2022-12-06
+## [1.18.0] - 2023-03-30
 ### Added
 - Footer to all pages. [#1044](https://github.com/rokwire/rokwire-building-blocks-api/issues/1044)
 - Input validation for contribute create page. [#1103](https://github.com/rokwire/rokwire-building-blocks-api/issues/1103)
diff --git a/contributions/catalog/webapps/static/css/style.css b/contributions/catalog/webapps/static/css/style.css
index 11700664..a455e3d1 100644
--- a/contributions/catalog/webapps/static/css/style.css
+++ b/contributions/catalog/webapps/static/css/style.css
@@ -145,6 +145,13 @@ html * {
     min-height: calc(100vh - 176px);
 }
 
+.details-row {
+    display: flex;
+    flex-wrap: wrap;
+}
+.details-table td:nth-of-type(1) {width: 210px;}
+.blank-row { height: 10px;}
+
 .row {
     display: flex;
     flex-wrap: wrap;
diff --git a/contributions/catalog/webapps/templates/contribute/capability_details.html b/contributions/catalog/webapps/templates/contribute/capability_details.html
index fc6dd6f5..3f839e63 100644
--- a/contributions/catalog/webapps/templates/contribute/capability_details.html
+++ b/contributions/catalog/webapps/templates/contribute/capability_details.html
@@ -29,7 +29,7 @@ <h1>Capability Details</h1>
     <hr class="divider"/>
     <div class="container details-container">
         <!-- capability details container -->
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Capability Name </h4>
             </div>
@@ -38,7 +38,7 @@ <h4>Capability Name </h4>
             </div>
         </div>
 
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Capability Description </h4>
             </div>
@@ -47,7 +47,7 @@ <h4>Capability Description </h4>
             </div>
         </div>
 
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Is Code Open Source? </h4>
             </div>
@@ -56,7 +56,7 @@ <h4>Is Code Open Source? </h4>
             </div>
         </div>
 
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Source Code Repository URL </h4>
             </div>
@@ -65,7 +65,7 @@ <h4>Source Code Repository URL </h4>
             </div>
         </div>
 
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>API Documentation URL </h4>
             </div>
@@ -75,7 +75,7 @@ <h4>API Documentation URL </h4>
         </div>
 
         {% if post.deploymentDetails%}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Deployment Location </h4>
                 </div>
@@ -87,7 +87,7 @@ <h4>Deployment Location </h4>
 
         {% if reviewer %}
             {% if post.version %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Version </h4>
                 </div>
@@ -97,7 +97,7 @@ <h4>Version </h4>
             </div>
             {% endif %}
             {% if post.healthCheckUrl %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Health Check URL </h4>
                 </div>
@@ -107,12 +107,12 @@ <h4>Health Check URL </h4>
             </div>
             {% endif %}
             {% if post.dataDeletionEndpointDetails %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Data Deletion Endpoint Details </h4>
                 </div>
                 <div class="col-12 col-md-9">
-                    <table>
+                    <table class="details-table">
                         {% if post.dataDeletionEndpointDetails.apiKey %}
                         <tr id="datadeletion_row">
                             <td><b>API Key&nbsp;&nbsp;</b></td>
@@ -132,17 +132,20 @@ <h4>Data Deletion Endpoint Details </h4>
                             <td>{{post.dataDeletionEndpointDetails.description}}</td>
                         </tr>
                         {% endif %}
+                        <tr class="blank-row">
+                            <td></td>
+                        </tr>
                     </table>
                 </div>
             </div>
             {% endif %}
             {% if post.deploymentDetails %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Deployment Details </h4>
                 </div>
                 <div class="col-12 col-md-9">
-                    <table>
+                    <table class="details-table">
                         {% if post.deploymentDetails.authMethod %}
                         <tr>
                             <td><b>Auth Method&nbsp;&nbsp;</b></td>
@@ -169,7 +172,7 @@ <h4>Deployment Details </h4>
                                                         <td class="hidetext">{{item[1]}}</td>
                                                         <td> &#160 &#160 <i class="bi bi-eye-slash field_icon" id="toggleText" style="cursor: pointer;"></i></td>
                                                     {% else %}
-                                                        <td style="padding:0 5px 0 5px;">{{item[0]}}: </td>
+                                                        <td style="padding:0 5px 0 0px; width:max-content">{{item[0]}}: </td>
                                                         <td>{{item[1]}}</td>
                                                     {% endif %}
                                                 {% endfor %}
@@ -186,6 +189,9 @@ <h4>Deployment Details </h4>
                             <td>{{post.deploymentDetails.location}}</td>
                         </tr>
                         {% endif %}
+                        <tr class="blank-row">
+                            <td></td>
+                        </tr>
                     </table>
                 </div>
             </div>
diff --git a/contributions/catalog/webapps/templates/contribute/contribution_details.html b/contributions/catalog/webapps/templates/contribute/contribution_details.html
index 0231f678..21ddfbc6 100644
--- a/contributions/catalog/webapps/templates/contribute/contribution_details.html
+++ b/contributions/catalog/webapps/templates/contribute/contribution_details.html
@@ -28,7 +28,7 @@ <h1 id="contribute">Contribution Details</h1>
 
     <div class="container">
         <!-- contribution details container -->
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Contribution Name</h4>
             </div>
@@ -37,7 +37,7 @@ <h4>Contribution Name</h4>
             </div>
         </div>
 
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Short Description</h4>
             </div>
@@ -47,7 +47,7 @@ <h4>Short Description</h4>
         </div>
 
         {% if post.longDescription %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Long Description</h4>
                 </div>
@@ -58,7 +58,7 @@ <h4>Long Description</h4>
         {% endif %}
 
         {% if post.contributors %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Contributor Details</h4>
                 </div>
@@ -104,7 +104,7 @@ <h4>Contributor Details</h4>
                 {% endfor %}
 
                 {% if contributor_ns.contributorType == "person" %}
-                    <div class="row">
+                    <div class="details-row">
                         <div class="col-12 col-md-3">
                             <h5>Person</h5>
                         </div>
@@ -159,7 +159,7 @@ <h5>Person</h5>
                     </div>
                 {% endif %}
                 {% if contributor_ns.contributorType == "organization" %}
-                    <div class="row" style="margin-top: 5px">
+                    <div class="details-row" style="margin-top: 5px">
                         <div class="col-12 col-md-3">
                             <h5>Organization</h5>
                         </div>
@@ -194,7 +194,7 @@ <h5>Organization</h5>
         {% endif %}
 
         {% if post.contacts %}
-            <div class="row" style="margin-top: 5px">
+            <div class="details-row" style="margin-top: 5px">
                 <div class="col-12 col-md-3">
                     <h4>Contact Details</h4>
                 </div>
@@ -245,7 +245,7 @@ <h4>Contact Details</h4>
         {% endif %}
 
         {% if post.capabilities %}
-            <div class="row justify-content-center">
+            <div class="details-row justify-content-center">
                 <div class="col-12 col-md-3">
                     <h4>Capabilities</h4>
                 </div>
@@ -271,7 +271,7 @@ <h4>{{c.name}}</h4>
         {% endif %}
 
         {% if post.talents %}
-            <div class="row justify-content-center">
+            <div class="details-row justify-content-center">
                 <div class="col-12 col-md-3">
                     <h4>Talents</h4>
                 </div>
@@ -297,7 +297,7 @@ <h4>{{t.name}}</h4>
         {% endif %}
 
         {% if (is_reviewer or is_editable or is_review) %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Admins</h4>
                 </div>
@@ -309,7 +309,7 @@ <h4>Admins</h4>
                     </div>
                 </div>
             </div>
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Status</h4>
                 </div>
@@ -317,7 +317,7 @@ <h4>Status</h4>
                     <div class="small-body-text">{{post.status}}</div>
                 </div>
             </div>
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Date Created</h4>
                 </div>
@@ -325,7 +325,7 @@ <h4>Date Created</h4>
                     <div class="small-body-text">{{post.dateCreated}}</div>
                 </div>
             </div>
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Date Modified</h4>
                 </div>
@@ -356,7 +356,7 @@ <h1>Review</h1>
             <hr class="divider"/>
             <form class="form-horizontal" method="POST" onsubmit="return data_validation()">
                 <div class="form-group">
-                    <div class="row">
+                    <div class="details-row">
                         <div class="col-12 col-md-3">
                             <h4>Status</h4>
                         </div>
@@ -395,7 +395,7 @@ <h4>Status</h4>
                     </div>
                 </div>
                 <div class="form-group">
-                    <div class="row">
+                    <div class="details-row">
                         <div class="col-12 col-md-3">
                             <h4>Comment</h4>
                         </div>
@@ -413,7 +413,7 @@ <h4>Comment</h4>
                     </div>
                 </div>
                 <div class="form-group">
-                    <div class="row">
+                    <div class="details-row">
                         <div class="col-12 col-md-3">
                             <h4>Last Updated</h4>
                         </div>
@@ -425,7 +425,7 @@ <h4>Last Updated</h4>
                         <input class="hidden" id="contribution_id" name="contribution_id" value="{{ post["id"] }}">
                     </div>
                 </div>
-                <div class="row">
+                <div class="details-row">
                     <div class="col-12 col-sm-2">
                         <table>
                             <tr>
diff --git a/contributions/catalog/webapps/templates/contribute/home.html b/contributions/catalog/webapps/templates/contribute/home.html
index 8f49e119..1c671c75 100644
--- a/contributions/catalog/webapps/templates/contribute/home.html
+++ b/contributions/catalog/webapps/templates/contribute/home.html
@@ -17,7 +17,6 @@
 
 <style>
 
-
     .dropdown-content {
         display: none;
         position: relative;
diff --git a/contributions/catalog/webapps/templates/contribute/talent_details.html b/contributions/catalog/webapps/templates/contribute/talent_details.html
index 3652b058..2b023505 100644
--- a/contributions/catalog/webapps/templates/contribute/talent_details.html
+++ b/contributions/catalog/webapps/templates/contribute/talent_details.html
@@ -29,7 +29,7 @@ <h1>Talent Details</h1>
     <hr class="divider"/>
 
     <div class="container details-container">
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Talent Name </h4>
             </div>
@@ -38,7 +38,7 @@ <h4>Talent Name </h4>
             </div>
         </div>
 
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Talent Description </h4>
             </div>
@@ -48,7 +48,7 @@ <h4>Talent Description </h4>
         </div>
 
         {% if post.dataDescription %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Data Description</h4>
                 </div>
@@ -59,7 +59,7 @@ <h4>Data Description</h4>
         {% endif %}
 
         {% if post.icon %}
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Icon</h4>
             </div>
@@ -70,7 +70,7 @@ <h4>Icon</h4>
         {% endif %}
 
         {% if post.requiredCapabilities %}
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Required Capabilities</h4>
             </div>
@@ -91,28 +91,28 @@ <h4>Required Capabilities</h4>
         {% endif %}
 
         {% if post.requiredBuildingBlocks %}
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Required Building Blocks</h4>
             </div>
             <div class="col-12 col-md-9">
                 <table>
-                {% for x in post.requiredBuildingBlocks %}
+                    {% for x in post.requiredBuildingBlocks %}
+                        <tr>
+                            <td>{{x}}</td>
+                        </tr>
+                    {% endfor %}
+                    <!-- extra row for the separation to next field -->
                     <tr>
-                        <td>{{x}}</td>
+                        <td>&nbsp;</td>
                     </tr>
-                {% endfor %}
-                <!-- extra row for the separation to next field -->
-                <tr>
-                    <td>&nbsp;</td>
-                </tr>
-            </table>
+                </table>
             </div>
         </div>
         {% endif %}
 
         {% if post.minUserPrivacyLevel %}
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>Minimum User Privacy Level</h4>
             </div>
@@ -123,7 +123,7 @@ <h4>Minimum User Privacy Level</h4>
         {% endif %}
 
         {% if post.minEndUserRoles %}
-        <div class="row">
+        <div class="details-row">
             <div class="col-12 col-md-3">
                 <h4>End-user Roles</h4>
             </div>
@@ -137,7 +137,7 @@ <h4>End-user Roles</h4>
 
         {% if reviewer %}
             {% if post.startDate %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Start Date</h4>
                 </div>
@@ -148,7 +148,7 @@ <h4>Start Date</h4>
             {% endif %}
 
             {% if post.endDate %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>End Date</h4>
                 </div>
@@ -159,7 +159,7 @@ <h4>End Date</h4>
             {% endif %}
 
             {% if post.longDescription %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Long Description</h4>
                 </div>
@@ -170,17 +170,17 @@ <h4>Long Description</h4>
             {% endif %}
 
             {% if post.selfCertification %}
-            <div class="row">
+            <div class="details-row">
                 <div class="col-12 col-md-3">
                     <h4>Self Certification</h4>
                 </div>
                 <div class="col-12 col-md-9">
                     <table>
                         {% if post.selfCertification.dataDeletionUponRequest %}
-                        <tr>
-                            <td><b>Deleting Data Upon Request&nbsp;&nbsp;</b></td>
-                            <td>{{post.selfCertification.dataDeletionUponRequest}}</td>
-                        </tr>
+                            <tr>
+                                <td><b>Deleting Data Upon Request&nbsp;&nbsp;</b></td>
+                                <td>{{post.selfCertification.dataDeletionUponRequest}}</td>
+                            </tr>
                         {% else %}
                             <tr>
                             <td><b>Deleting Data Upon Request&nbsp;&nbsp;</b></td>
@@ -188,10 +188,10 @@ <h4>Self Certification</h4>
                             </tr>
                         {% endif %}
                         {% if post.selfCertification.discloseAds %}
-                        <tr>
-                            <td><b>Disclose Ads&nbsp;&nbsp;</b></td>
-                            <td>{{post.selfCertification.discloseAds}}</td>
-                        </tr>
+                            <tr>
+                                <td><b>Disclose Ads&nbsp;&nbsp;</b></td>
+                                <td>{{post.selfCertification.discloseAds}}</td>
+                            </tr>
                         {% else %}
                             <tr>
                             <td><b>Disclose Ads&nbsp;&nbsp;</b></td>