Fix in place forms not being populates when editing collections

The code to associate the elements on the page was relying on sections
with class names which have since been removed so change to using uls
and add class names to those
Fix placement of newly added list items

Update how we work out where to add new items to lists to cope with
the changed page layout
Merge remote-tracking branch 'origin/master'