Update layout for 2.4