fixed a few merge conflicts
Styled tables