Fixed Connect Button issues