integration of layouts 05-09-1807