Fixup asset allocations
Move survey to end, include 'repeat', and add text to survey and final screens