Language improvements.
Reorder details data in template.