product layout
merge fix