Clean up buttons

Refacto du button