Implement Wallet QA changes

Address @michaelfbradley 's feedback below

Edited by Mark Harding