Condensed all connections to one row

With the addition of the SSH connection, the properties table was getting a bit
crowded. All connection options have been condensed to one row.
Merge branch 'condense_rows' into develop

- Condensed all connection options into one row