added toasts, fixed shitty organisation