Fixed lack of double ring of active wp, made XMLGui common, fixed which origin route is displayed for renegotiation