Few updates to the form