Adding modals to the Management page
Fixing merge conflicts