Broken-Theme Fixes

Thanks.
We need to create one modal and reuse the same one if it has been created already.