Fixed ConnectActivity

Combined the ConnectActivity design with the ConnectionActivity
implementation.