Added margin
Added support for tables