Added modals instead of js pop-ups