Right now we arrange the buttons just by using the order in which they were added. We can use flex order instead.
<rdar://problem/20964961>