Fixing modal
Refactoring modals
Refactoring modals
Refactoring modals