BZ-9388: Create Mark-up for Modal Pop-up
BZ-9480
Offers Improvements