getting rid of Connect and Fix button (wip)