Merge "Menu shuffling"