Final work on connect buttons in settings screen