make some cosmetic changes for new form