SOme fixes for quiz template.
Added even more options for client templates.