Bugfix: reorder html elements in the content templates