More to servers & small ui update