Design: reworked buttons