feat(*): #819 - simplify multiple buttons code