Default K&P Filter fix and code cleanup

Fix: If default large K&P button was kept, the button wasn't being updated to reflect the setting for "Default K&P Filter".

Simplify and cleanup more code.