Added accounts and moved header to a template