Adds revised layout (draft 2)