add admin_noices and other bug fix