Add server duplication and clean up long-press menu.