Add layout support
Add layout test