Reply to APC40 Mapping Issue

I just picked up an APC 40 and I love it. I have been hard at work creating a custom mapping for it but I have hit a snag and can't seem to get these buttons to work correctly.

Whatever I map to the Pan, Send A, Send B, Send C buttons always works correctly but never turns off correctly. Currently I have Filter On mapped to the Pan Button located below Knob 5. When I press this button the light turns on and so does the filter. When I hit the button again nothing happens. When I hit it a 3rd time it turns off but the light comes back on. I'm not too worried about the LEDs being wrong atm I can fix that later but I am concerned that whatever I keep mapping to these button never turn off unless I press them twice. Anyone have any idea what may be causing this?

On another note I have been trying to find a way to map a layout change button to not only change the decks and mixer layout but also to switch from having 2 FX units to 4 and vice versa any help on that would be awesome.