Fix indentation, validation, unnecessary validations, language -- Recovering extra fields state after posting form!