Fixing rendering problems
Class templating
MOre class templating