Remove bogus i18n:attributes elements.
Bring closed to Euphorie template

Reorder a few things without changing any results to reduce the
differences from the original template in Euphorie.