Added server names in the correct area
Fixed issue #46