More changes for new image ordering
Changed the way `image` fields are ordered

Shying away from `menu_order`
Merge pull request #341 from funkedgeek/upstream

Changes to `image` based fields