Improve connection screen a bit