Remove button ids
Replace Connexion by Connection
Add missing definition
Fix scenarios