fixed some table layouts, better default data