changed layout and insert tables.
not finished!!