Revert "Revert "bootstrap modal changes""

This reverts commit 44ba811f9ae1e26af46a4f86ed48d49115c24227.