Add button map
Fix Shake n Bake