Fixed Tab complete bug and modified connect buttons for future change.