fixed Layout.ts