Add new eloquent modals and refactor some code