Fix error with header, moving tableheaders into table