Form fixes, resolved calculator issue.