Merge interstitial and choice modals into one.

Modal now resizes and content is transitioned inside a single modal.