clean up and form changes

facebook left