Form fields improvements