Added more widths and such to tables