Fix the modal display
Fix the org modal button