Buttons implemented again
merge fixed