Changed the order of the popup buttons