Choose server - UI improvments