Refactored cycle form.

Would really like to get all the form stuff in a mixin, but that isn't
for now I guess.
Added missing semicolon.