Update layout and submodule