UX improvement with modals, deleting unnecessary code