diff --git a/polygerrit-ui/app/elements/gr-change-view.html b/polygerrit-ui/app/elements/gr-change-view.html
index 3aa12cf42e..3c7b0a00fd 100644
--- a/polygerrit-ui/app/elements/gr-change-view.html
+++ b/polygerrit-ui/app/elements/gr-change-view.html
@@ -108,6 +108,9 @@ limitations under the License.
       gr-reviewer-list {
         min-width: 25em;
       }
+      .changeMetadata {
+        margin-right: 1em;
+      }
       .changeMetadata-label {
         font-weight: bold;
       }
@@ -131,7 +134,7 @@ limitations under the License.
       }
       .commitMessage {
         font-family: var(--monospace-font-family);
-        margin-left: 1em;
+        margin-right: 2em;
         max-width: 72ch;
       }
       .commitMessage h4 {
@@ -140,18 +143,26 @@ limitations under the License.
         margin-bottom: .25em;
       }
       gr-file-list {
-        padding: 0 var(--default-horizontal-margin) 10px;
-      }
-      gr-related-changes-list {
-        border-top: 1px solid #ddd;
+        margin-bottom: 1em;
         padding: 0 var(--default-horizontal-margin);
       }
-      @media screen and (max-width: 55em) {
+      @media screen and (max-width: 80em) {
+        .changeInfo {
+          flex-wrap: wrap;
+        }
+      }
+      @media screen and (max-width: 60em) {
         .changeInfo {
           flex-direction: column;
+          flex-wrap: nowrap;
+        }
+        .changeMetadata,
+        .commitMessage,
+        gr-related-changes-list {
+          margin-right: 0;
+          margin-top: .25em;
         }
         .commitMessage {
-          margin-left: 0;
           max-width: none;
         }
       }
@@ -276,16 +287,16 @@ limitations under the License.
               content="[[_commitInfo.message]]"
               config="[[_projectConfig.commentlinks]]">
         
+        
       
       
-      
       
 
-    Related changes
     Loading...