Implement new wallet template

Edited by Mark Harding