more refactor choice Views