Fixed a major form bug, minor template errors.