Added updated server section & made server selection process smarter and cleaner