Re-write to support two menu options for servers