Improve account and book templates