Shoved some traces around to stay clear of button switch bodies.