Optimize buttons

:bulb: