Fix data reference sizes, updated h3b layout name