style for tables
Merge branch 'dev'