Added toasts showing, fixed some bugs