Added accounts and abstracted header into template