improve form formating