Split error message to individual menu item
Minor fix
Fix bugs when duplicate server
Improvements and refactor