*8212* improve form layout