Button fixes

This cleans up a ton of issues with button wirings and also makes them consistent across the modules.