Fluid layout

wrappers
table
other small fixes