Final layout edited