Fund wallet modal

Thinking about the hierarchy of QR codes and addresses:

How can they be better represented?
How will the integration of ENS change this paradigm?