I only modified what was necessary when I first built the mod, but I agree that a wrapper for each button would make it easier to handle them as units. I probably will do that when I do a new version of it.