Further work for table_layout