Start of refactoring to allow connect buttons in setup screen