Small changes to renamed layout.