update helper calls and compact layout tokens with new info