add borders to forms
resolved merge issues
fix merge issues