connection screen finish + refactor