move form into content, clean