Refactor table elements
Add default template