many changes to tables and layouts