Improve indent
Add closeModal trigger