Improve book templates