Theme tweaks plus handling change to how mids are stored in field collections