Tweak button member assignment order