Rearrange buttons on CardDeckViewControllers; fix persistence of presentation descriptions;