Merge pull request #4 from emmairwin/7.x-dev

MISC: updated to use common_fields body / machine name to page