Yep, that's the worst. Reordering static-looking buttons is awful, but promoting options in and out of a secondary menu is completely deranged design.