Minor refactors to Items new form templates