Within groups, the order that @commands are defined in is lost, and the buttons on the generated screen are in alphabetical order. We should remove this sort and allow for user defined order.