Remove modal and use simple form