diff --git a/java/com.sap.sailing.gwt.ui/AdminConsole.css b/java/com.sap.sailing.gwt.ui/AdminConsole.css
index 292500a0b47..2662e31d92b 100644
--- a/java/com.sap.sailing.gwt.ui/AdminConsole.css
+++ b/java/com.sap.sailing.gwt.ui/AdminConsole.css
@@ -17,6 +17,21 @@ h1 {
   text-align: center;
 }
 
+fieldset {
+	padding: 6px 6px;
+	margin: 8px 3px 10px 2px;
+	border: 1px solid black;
+}
+
+fieldset legend {
+	padding: 0px 4px;
+	font-weight: bold;
+}
+
+button {
+	margin-left: 5px;
+}
+
 .chartLegend {
 	float: left;
 	margin-right: 4px;
diff --git a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ReplicationPanel.java b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ReplicationPanel.java
index 9d871f66d6c..31d1051817a 100755
--- a/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ReplicationPanel.java
+++ b/java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/adminconsole/ReplicationPanel.java
@@ -50,6 +50,15 @@ public class ReplicationPanel extends FlowPanel {
         this.stringMessages = stringMessages;
         this.errorReporter = errorReporter;
         
+        Button refreshButton = new Button(stringMessages.refresh());
+        refreshButton.addClickHandler(new ClickHandler() {
+            @Override
+            public void onClick(ClickEvent event) {
+                updateReplicaList();
+            }
+        });
+        add(refreshButton);
+        
         final CaptionPanel mastergroup = new CaptionPanel(stringMessages.explainReplicasRegistered());
         final VerticalPanel masterpanel = new VerticalPanel();
         
@@ -78,14 +87,6 @@ public class ReplicationPanel extends FlowPanel {
         registeredMasters.resizeColumns(3);
         replicapanel.add(registeredMasters);
         
-        Button refreshButton = new Button(stringMessages.refresh());
-        refreshButton.addClickHandler(new ClickHandler() {
-            @Override
-            public void onClick(ClickEvent event) {
-                updateReplicaList();
-            }
-        });
-        replicapanelbuttons.add(refreshButton);
         addButton = new Button(stringMessages.connectToMaster());
         addButton.addClickHandler(new ClickHandler() {
             @Override
@@ -107,6 +108,7 @@ public class ReplicationPanel extends FlowPanel {
         replicapanel.add(replicapanelbuttons);
         replicagroup.add(replicapanel);
         add(replicagroup);
+        
         updateReplicaList();
     }