formular fields improvement and bug fix