Added modals for forms
Latest changes