small clean up
new tables layout and fields_layouts