Added accounts and added template to the header.
Merge and fix conflicts.