diff --git a/app/templates/admin.html b/app/templates/admin.html
index 8ed7a074..92fb3c85 100644
--- a/app/templates/admin.html
+++ b/app/templates/admin.html
@@ -240,17 +240,19 @@
 					</select>
 				</td>
 				<td>
-					<select id="credentials-{{server.0}}">
-						<option disabled selected>Choose credentials</option>
-						{% for ssh in sshs %}
-							{% if ssh.0 == server.7	%}
-								<option value="{{ssh.0}}" selected>{{ssh.1}}</option>
-							{% else %}
-								<option value="{{ssh.0}}">{{ssh.1}}</option>
-							{% endif %}
-						{% endfor %}
-					</select>
-					<button onclick="checkSshConnect('{{server.2}}')">Check SSH</button>
+					<div class="controlgroup">
+						<select id="credentials-{{server.0}}">
+							<option disabled selected>Choose credentials</option>
+							{% for ssh in sshs %}
+								{% if ssh.0 == server.7	%}
+									<option value="{{ssh.0}}" selected>{{ssh.1}}</option>
+								{% else %}
+									<option value="{{ssh.0}}">{{ssh.1}}</option>
+								{% endif %}
+							{% endfor %}
+						</select>
+						<button onclick="checkSshConnect('{{server.2}}')" title="Check SSH connect to the server {{server.1}}">check</button>
+					</div>
 				</td>
 				<td>
 					{% if server.11  != "None" %}
diff --git a/app/templates/ajax/new_server.html b/app/templates/ajax/new_server.html
index cac636cf..35d27963 100644
--- a/app/templates/ajax/new_server.html
+++ b/app/templates/ajax/new_server.html
@@ -66,17 +66,19 @@
 					</select>
 				</td>
 				<td>
-					<select id="credentials-{{server.0}}">
-						<option value="0" selected>Choose credentials</option>
-						{% for ssh in sshs %}
-							{% if ssh.0 == server.7	%}
-								<option value="{{ssh.0}}" selected>{{ssh.1}}</option>
-							{% else %}
-								<option value="{{ssh.0}}">{{ssh.1}}</option>
-							{% endif %}
-						{% endfor %}
-					</select>
-					<button onclick="checkSshConnect('{{server.2}}')">Check SSH</button>
+					<div class="controlgroup">
+						<select id="credentials-{{server.0}}">
+							<option value="0" selected>Choose credentials</option>
+							{% for ssh in sshs %}
+								{% if ssh.0 == server.7	%}
+									<option value="{{ssh.0}}" selected>{{ssh.1}}</option>
+								{% else %}
+									<option value="{{ssh.0}}">{{ssh.1}}</option>
+								{% endif %}
+							{% endfor %}
+						</select>
+						<button onclick="checkSshConnect('{{server.2}}')" title="Check SSH connect to the server {{server.1}}">check</button>
+					</div>
 				</td>
 				<td>
 					{% if server.11  != "None" %}
diff --git a/app/templates/servers.html b/app/templates/servers.html
index ed6ffe49..b03f2f0d 100644
--- a/app/templates/servers.html
+++ b/app/templates/servers.html
@@ -165,17 +165,19 @@
 					</select>
 				</td>
 				<td>
-					<select id="credentials-{{server.0}}">
-						<option disabled selected>Choose credentials</option>
-						{% for ssh in sshs %}
-								{% if ssh.0 == server.7	%}
-									<option value="{{ssh.0}}" selected>{{ssh.1}}</option>
-								{% else %}
-									<option value="{{ssh.0}}">{{ssh.1}}</option>
-								{% endif %}
-						{% endfor %}
-					</select>
-					<button onclick="checkSshConnect('{{server.2}}')">Check SSH</button>
+					<div class="controlgroup">
+						<select id="credentials-{{server.0}}">
+							<option disabled selected>Choose credentials</option>
+							{% for ssh in sshs %}
+									{% if ssh.0 == server.7	%}
+										<option value="{{ssh.0}}" selected>{{ssh.1}}</option>
+									{% else %}
+										<option value="{{ssh.0}}">{{ssh.1}}</option>
+									{% endif %}
+							{% endfor %}
+						</select>
+						<button onclick="checkSshConnect('{{server.2}}')" title="Check SSH connect to the server {{server.1}}">check</button>
+					</div>
 				</td>
 				<td>
 					{% if server.11  != "None" %}