moved form to core; fix form