Add sweetalert, and more fix