Many changes in restructuring tables, getting Review pages to work correctly