Update layout and import rules