tables good lay out
Merge branch 'anton2'