Reordering buttons, adding a separate include for menu