Now it displays token address everywhere and has the label 'withTokens' everywhere, even if the address has never touched tokens which is confusing. 