bug fix, create better form elements and remove the white color from the heading