Update layout based on new layout as recommended by Mike