Issue #153 - Updates for Schema 1.1 - added fields on resource page + some minor renames