[22-DESIGN: Update active state of buttons and more]