Some stuff
Fix for previous fix
Showing toast when trying to add tokens
Merge branch 'Fixtest'