fields re-ordered, buttons added