diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
index 2b7cfb265a..ca9f248fcd 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java
@@ -67,6 +67,7 @@ public interface GerritCss extends CssResource {
   String commentPanelHeader();
   String commentPanelLast();
   String commentPanelMessage();
+  String commentPanelMenuBar();
   String commentPanelSummary();
   String commentPanelSummaryCell();
   String complexHeader();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/openid.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/openid.css
index 07133918fe..1e475ee6c1 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/openid.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/auth/openid/openid.css
@@ -23,7 +23,6 @@
 }
 
 .logo {
-  width: 98%;
   text-align: right;
 }
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
index 7a7f5fe54a..4db387f9ce 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/changes/ChangeScreen.java
@@ -29,9 +29,9 @@ import com.google.gerrit.common.data.ChangeInfo;
 import com.google.gerrit.common.data.ToggleStarRequest;
 import com.google.gerrit.reviewdb.Account;
 import com.google.gerrit.reviewdb.Change;
+import com.google.gerrit.reviewdb.Change.Status;
 import com.google.gerrit.reviewdb.ChangeMessage;
 import com.google.gerrit.reviewdb.PatchSet;
-import com.google.gerrit.reviewdb.Change.Status;
 import com.google.gwt.event.dom.client.ClickEvent;
 import com.google.gwt.event.dom.client.ClickHandler;
 import com.google.gwt.event.dom.client.KeyPressEvent;
@@ -39,6 +39,7 @@ import com.google.gwt.event.shared.HandlerRegistration;
 import com.google.gwt.i18n.client.LocaleInfo;
 import com.google.gwt.user.client.ui.DisclosurePanel;
 import com.google.gwt.user.client.ui.FlowPanel;
+import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.Panel;
@@ -182,7 +183,7 @@ public class ChangeScreen extends Screen {
 
     dependencies = new ChangeTable() {
       {
-        table.setWidth("98%");
+        table.setWidth("auto");
       }
     };
     dependsOn = new ChangeTable.Section(Util.C.changeScreenDependsOn());
@@ -192,7 +193,6 @@ public class ChangeScreen extends Screen {
 
     dependenciesPanel = new DisclosurePanel(Util.C.changeScreenDependencies());
     dependenciesPanel.setContent(dependencies);
-    dependenciesPanel.setWidth("95%");
     add(dependenciesPanel);
 
     patchSetsBlock = new PatchSetsBlock(this);
@@ -272,15 +272,17 @@ public class ChangeScreen extends Screen {
   private void addComments(final ChangeDetail detail) {
     comments.clear();
 
-    final Label hdr = new Label(Util.C.changeScreenComments());
-    hdr.setStyleName(Gerrit.RESOURCES.css().blockHeader());
-    comments.add(hdr);
-
     final AccountInfoCache accts = detail.getAccounts();
     final List<ChangeMessage> msgList = detail.getMessages();
+
+    HorizontalPanel title = new HorizontalPanel();
+    title.setWidth("100%");
+    title.add(new Label(Util.C.changeScreenComments()));
     if (msgList.size() > 1) {
-      comments.add(messagesMenuBar());
+      title.add(messagesMenuBar());
     }
+    title.setStyleName(Gerrit.RESOURCES.css().blockHeader());
+    comments.add(title);
 
     final long AGE = 7 * 24 * 60 * 60 * 1000L;
     final Timestamp aged = new Timestamp(System.currentTimeMillis() - AGE);
@@ -316,24 +318,22 @@ public class ChangeScreen extends Screen {
       comments.add(cp);
     }
 
-    if (msgList.size() > 1) {
-      comments.add(messagesMenuBar());
-    }
     comments.setVisible(msgList.size() > 0);
   }
 
   private LinkMenuBar messagesMenuBar() {
     final Panel c = comments;
-    final LinkMenuBar m = new LinkMenuBar();
-    m.addItem(Util.C.messageExpandRecent(), new ExpandAllCommand(c, true) {
+    final LinkMenuBar menuBar = new LinkMenuBar();
+    menuBar.addItem(Util.C.messageExpandRecent(), new ExpandAllCommand(c, true) {
       @Override
       protected void expand(final CommentPanel w) {
         w.setOpen(w.isRecent());
       }
     });
-    m.addItem(Util.C.messageExpandAll(), new ExpandAllCommand(c, true));
-    m.addItem(Util.C.messageCollapseAll(), new ExpandAllCommand(c, false));
-    return m;
+    menuBar.addItem(Util.C.messageExpandAll(), new ExpandAllCommand(c, true));
+    menuBar.addItem(Util.C.messageCollapseAll(), new ExpandAllCommand(c, false));
+    menuBar.addStyleName(Gerrit.RESOURCES.css().commentPanelMenuBar());
+    return menuBar;
   }
 
   private void toggleStar() {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
index 15c032dce7..d02ae450c1 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css
@@ -69,7 +69,6 @@
   font-size: 11pt;
   padding-left: 5px;
   padding-right: 5px;
-  width: 98%;
 }
 
 .version,
@@ -199,6 +198,9 @@
   padding-left: 0.5em;
   padding-right: 0.5em;
 }
+.commentPanelMenuBar {
+  float: right;
+}
 .commentPanelMessage p {
   margin-top: 0px;
   margin-bottom: 0px;
@@ -767,8 +769,7 @@
 }
 
 .changeComments {
-  margin-left: 0.5em;
-  margin-right: 0.5em;
+  padding-top: 1em;
   width: 60em;
 }
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/HistoryTable.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/HistoryTable.java
index f7f99e1e45..cb85c2448e 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/HistoryTable.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/patches/HistoryTable.java
@@ -38,7 +38,7 @@ class HistoryTable extends FancyFlexTable<Patch> {
   HistoryTable(final PatchScreen parent) {
     setStyleName(Gerrit.RESOURCES.css().patchHistoryTable());
     screen = parent;
-    table.setWidth("98%");
+    table.setWidth("auto");
     table.addStyleName(Gerrit.RESOURCES.css().changeTable());
   }