Bug fixes in connection and contact screen