Fix for #346 & #347

Remove success toasts and make UI more optimistic.

Only exception is on RT, but will try and look at that shortly.

I'll merge pull once that bit is done (if it's possible)