fixed table padding
Merge branch 'template_refactoring'