Refactor for connection display