update include and layouts