Removed the popups for server connection and added labels
fixed the merge conflicts