Refactor - cleanup the Wallet Overview controller