More HTML form changes to fix div problems