consolidate connection state layout