Improve connection view handling.