Merge "ChangeScreen2: Fix nested HTML bug in reviewer list"
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java
index 4ded78f..969889f 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java
@@ -261,14 +261,14 @@
         name = Integer.toString(ai._account_id());
       }
 
-      html.openSpan();
-      html.setAttribute("role", "listitem");
-      html.setAttribute(DATA_ID, ai._account_id());
-      html.setStyleName(style.label_user());
+      html.openSpan()
+          .setAttribute("role", "listitem")
+          .setAttribute(DATA_ID, ai._account_id())
+          .setStyleName(style.label_user());
       if (img != null) {
-        html.openElement("img");
-        html.setStyleName(style.avatar());
-        html.setAttribute("src", img.url());
+        html.openElement("img")
+            .setStyleName(style.avatar())
+            .setAttribute("src", img.url());
         if (img.width() > 0) {
           html.setAttribute("width", img.width());
         }
@@ -279,10 +279,11 @@
       }
       html.append(name);
       if (removable.contains(ai._account_id())) {
-        html.openElement("button");
-        html.setAttribute("title", Util.M.removeReviewer(name));
-        html.setAttribute("onclick", REMOVE + "(event)");
-        html.append(new ImageResourceRenderer().render(Resources.I.remove_reviewer()));
+        html.openElement("button")
+            .setAttribute("title", Util.M.removeReviewer(name))
+            .setAttribute("onclick", REMOVE + "(event)")
+            .append(new ImageResourceRenderer().render(Resources.I.remove_reviewer()))
+            .closeElement("button");
       }
       html.closeSpan();
     }