Fixed up helpbox issue
Fixed up blank fields on change type