Re-enabled Andy's plugin disabling functionality. Added badge hide, too.