Fix z-indexs with new form field types