diff --git a/packages/strapi-helper-plugin/lib/src/components/PluginHeader/index.js b/packages/strapi-helper-plugin/lib/src/components/PluginHeader/index.js
index c1716b938f..d2b2e57c75 100644
--- a/packages/strapi-helper-plugin/lib/src/components/PluginHeader/index.js
+++ b/packages/strapi-helper-plugin/lib/src/components/PluginHeader/index.js
@@ -14,7 +14,7 @@ class PluginHeader extends React.Component { // eslint-disable-line react/prefer
   render() {
     return (
       <div className={`${styles.pluginHeader} row`}>
-        <div className="col-lg-6">
+        <div className="col-lg-7">
           <PluginHeaderTitle
             title={this.props.title}
             description={this.props.description}
@@ -25,7 +25,7 @@ class PluginHeader extends React.Component { // eslint-disable-line react/prefer
             actions={this.props.subActions || []}
           />
         </div>
-        <div className="col-lg-4 justify-content-end">
+        <div className="col-lg-3 justify-content-end">
           <PluginHeaderActions
             actions={this.props.actions || []}
           />
diff --git a/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js b/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js
index b1d62baa3e..cfa729b56d 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/TableRow/index.js
@@ -26,13 +26,13 @@ class TableRow extends React.Component {
    * @returns {*}
    */
   getDisplayedValue(type, value) {
-    switch (type) {
+    switch (type.toLowerCase()) {
       case 'string':
-        return !isEmpty(value) ? value.toString() : '-';
+        return value && !isEmpty(value.toString()) ? value.toString() : '-';
       case 'integer':
-        return !isEmpty(value) ? value.toString() : '-';
+        return value && !isEmpty(value.toString()) ? value.toString() : '-';
       case 'boolean':
-        return !isEmpty(value) ? value.toString() : '-';
+        return value && !isEmpty(value.toString()) ? value.toString() : '-';
       default:
         return '-';
     }
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
index 58ed2ba09b..fa13014d13 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/Edit/index.js
@@ -154,7 +154,7 @@ export class Edit extends React.Component {
             fullWidth={this.props.isRelationComponentNull}
           />
           <div className='row'>
-            <div className={this.props.isRelationComponentNull ? `col-lg-12` : `col-lg-8`}>
+            <div className={this.props.isRelationComponentNull ? `col-lg-12` : `col-lg-9`}>
               <div className={styles.main_wrapper}>
                 <EditForm
                   record={this.props.record}
@@ -167,7 +167,7 @@ export class Edit extends React.Component {
                 />
               </div>
             </div>
-            <div className={`col-lg-4 ${this.props.isRelationComponentNull ? 'hidden-xl-down' : ''}`}>
+            <div className={`col-lg-3 ${this.props.isRelationComponentNull ? 'hidden-xl-down' : ''}`}>
               <div className={styles.sub_wrapper}>
                 <EditFormRelations
                   currentModelName={this.props.currentModelName}