Defects upgrade. Controller cleanup.
Fixed font adjust on collages.
Initial work on captcha upgrade.