Fix proper places to create/measure/layout items