Get gift list styles in order, fix some other small problems