Add account block
Update templates