Change to new style hash in layout file