--- luasrc/view/admin_network/diagnostics.htm	2018-07-03 15:17:57.633203371 +0200
+++ luasrc/view/admin_network/diagnostics.htm	2018-06-08 10:45:56.107723557 +0200
@@ -72,7 +78,7 @@
 
 			<br />
 
-			<div style="width:30%; float:left">
+			<div style="width:23%; float:left">
 				<input style="margin: 5px 0" type="text" value="<%=ping_host%>" name="ping" /><br />
 				<% if has_ping6 then %>
 				<select name="ping_proto" style="width:auto">
@@ -85,7 +91,7 @@
 				<% end %>
 			</div>
 
-			<div style="width:33%; float:left">
+			<div style="width:23%; float:left">
 				<input style="margin: 5px 0" type="text" value="<%=route_host%>" name="traceroute" /><br />
 				<% if has_traceroute6 then %>
 				<select name="traceroute_proto" style="width:auto">
@@ -102,11 +108,39 @@
 				<% end %>
 			</div>
 
-			<div style="width:33%; float:left;">
+			<div style="width:23%; float:left;">
 				<input style="margin: 5px 0" type="text" value="<%=dns_host%>" name="nslookup" /><br />
 				<input type="button" value="<%:Nslookup%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.nslookup)" />
 			</div>
 
+			<% if has_speedtest and false then %>
+			<div style="width:23%; float:left;">
+				<input style="margin: 5px 0" type="text" value="" name="speedtest" placeholder="alternate server" /><br />
+				<input type="button" value="<%:Speedtest%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.speedtest)" />
+			</div>
+			<% end %>
+
+			<% if has_iperf3 then %>
+			<div style="width:23%; float:left;">
+				<input style="margin: 5px 0" type="text" value="<%=iperf3_host%>" name="iperf3" /><br />
+				<input type="button" value="<%:Iperf3%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.iperf3)" />
+			</div>
+			<% end %>
+
+			<% if has_curl then %>
+			<div style="width:23%; float:left;">
+				<input style="margin: 5px 0" type="hidden" value="<%=getip_host%>" name="getip" /><br />
+				<input type="button" value="<%:Get public IP%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.getip)" />
+			</div>
+			<% end %>
+
+			<% if has_netstat then %>
+			<div style="width:23%; float:left;">
+				<input style="margin: 5px 0" type="hidden" value="" name="netstat" /><br />
+				<input type="button" value="<%:Netstat%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.netstat)" />
+			</div>
+			<% end %>
+
 			<br style="clear:both" /><br />
 
 		</fieldset>