Moved secondary tables to lower text space and packed tables as tightly as possible

Change-Id: Icb534cdcb4d3ebf209eb76f5b8fa3859323bd6cb