More UI and draw code, proper connect popup