Bugfix on book row template.
Minor refactoring.