Base: Improve site connecting modal