UI Fixes. More wallet v2 support.