Added tables, fixed layout bug.