migrated button handlers & RigCollection/Rig usage