Added toasts, small changes before refactor attempt