Working :

- Refactor modal