Feature/add modals