Make connect button work
Use a more accurate of determining which subsystem should have focus