Shifting the speaker pin so that it is positioned better
Shifting the button pins so they are all grouped together (in the real hardware space)