Update layout file to eliminate future redundancy