UI enhancement to forms