rearranged some </form> tags