Add missing layouts

Change-Id: If59352aa09cfe98339c487a3d6ff0f67ba62066f