Styled tables, refactores some bits