some WIP enhancements on entities
WIP page rendering in stacks