change buttons comportement to toggle on clicking +
merge