Update and Fix Form