Fixing form issues