Added choice modal and created abstraction from the base choice modal.