#3222 completed the basic layout update on the document