Final layout update