Added selection menus for connections
Merged changes