Modify connection page and improve connection flow