cleaned up process of adding server and changed UI