Connection page
Merge branch 'master' into icomm
Merge connection + main