Added extra classes to Forms and tables to allow better individual styling
Fixed some missing $ in template