more styling on tables
resolved merge conflicts, I think