Fix toasts
#28 On the way to onTap