Final layout upload

Final layout upload before implementation.