Update layout + entity