[TASK] Table padding/structure

Change-Id: I77541d032eda544f321ccc8a8c2513b33a5e2f92