changed form to div where possible