menu refactored
fixes display of servername/-password