diff --git a/src/__tests__/diff2html-tests.ts b/src/__tests__/diff2html-tests.ts
index bd063e1..41405f8 100644
--- a/src/__tests__/diff2html-tests.ts
+++ b/src/__tests__/diff2html-tests.ts
@@ -439,7 +439,7 @@ describe('Diff2Html', () => {
                             <tr>
             <td class="d2h-code-side-linenumber d2h-info"></td>
             <td class="d2h-info">
-                <div class="d2h-code-side-line"></div>
+                <div class="d2h-code-side-line">&nbsp;</div>
             </td>
         </tr><tr>
             <td class="d2h-code-side-linenumber d2h-ins d2h-change">
@@ -510,7 +510,7 @@ describe('Diff2Html', () => {
                             <tr>
             <td class="d2h-code-side-linenumber d2h-info"></td>
             <td class="d2h-info">
-                <div class="d2h-code-side-line"></div>
+                <div class="d2h-code-side-line">&nbsp;</div>
             </td>
         </tr><tr>
             <td class="d2h-code-side-linenumber d2h-ins d2h-change">
@@ -601,7 +601,7 @@ describe('Diff2Html', () => {
                             <tr>
             <td class="d2h-code-side-linenumber d2h-info"></td>
             <td class="d2h-info">
-                <div class="d2h-code-side-line"></div>
+                <div class="d2h-code-side-line">&nbsp;</div>
             </td>
         </tr><tr>
             <td class="d2h-code-side-linenumber d2h-ins d2h-change">
diff --git a/src/__tests__/side-by-side-printer-tests.ts b/src/__tests__/side-by-side-printer-tests.ts
index 39052c8..681022e 100644
--- a/src/__tests__/side-by-side-printer-tests.ts
+++ b/src/__tests__/side-by-side-printer-tests.ts
@@ -118,7 +118,7 @@ describe('SideBySideRenderer', () => {
           "right": "<tr>
             <td class="d2h-code-side-linenumber d2h-info"></td>
             <td class="d2h-info">
-                <div class="d2h-code-side-line"></div>
+                <div class="d2h-code-side-line">&nbsp;</div>
             </td>
         </tr><tr>
             <td class="d2h-code-side-linenumber d2h-cntx">
@@ -323,7 +323,7 @@ describe('SideBySideRenderer', () => {
                             <tr>
             <td class="d2h-code-side-linenumber d2h-info"></td>
             <td class="d2h-info">
-                <div class="d2h-code-side-line"></div>
+                <div class="d2h-code-side-line">&nbsp;</div>
             </td>
         </tr><tr>
             <td class="d2h-code-side-linenumber d2h-ins d2h-change">
@@ -469,7 +469,7 @@ describe('SideBySideRenderer', () => {
                             <tr>
             <td class="d2h-code-side-linenumber d2h-info"></td>
             <td class="d2h-info">
-                <div class="d2h-code-side-line"></div>
+                <div class="d2h-code-side-line">&nbsp;</div>
             </td>
         </tr>
                             </tbody>
diff --git a/src/templates/generic-block-header.mustache b/src/templates/generic-block-header.mustache
index b9488cb..efbbc42 100644
--- a/src/templates/generic-block-header.mustache
+++ b/src/templates/generic-block-header.mustache
@@ -1,6 +1,6 @@
 <tr>
     <td class="{{lineClass}} {{CSSLineClass.INFO}}"></td>
     <td class="{{CSSLineClass.INFO}}">
-        <div class="{{contentClass}}">{{{blockHeader}}}</div>
+        <div class="{{contentClass}}">{{#blockHeader}}{{{blockHeader}}}{{/blockHeader}}{{^blockHeader}}&nbsp;{{/blockHeader}}</div>
     </td>
 </tr>
diff --git a/src/ui/css/diff2html.css b/src/ui/css/diff2html.css
index 0e751eb..ae6f4b7 100644
--- a/src/ui/css/diff2html.css
+++ b/src/ui/css/diff2html.css
@@ -100,7 +100,7 @@
 }
 
 .d2h-files-diff {
-  display: table;
+  display: flex;
   width: 100%;
 }