Added toastr & some login