Removed uneeded i tag
Fixed reordering servers