Fixing generating and displaying choices