frontend cleanup
include advanced form fields