Update layout to match old version for now