Merge pull request #442 from protomors/tables

Convert tables from render functions to templates.

Author: mariusa