Solved issue rearange form fields