updated to use a layout
merge