Tidy "gateway name - IP" in dropdown list

for 2.1 branch