Refactor edit partials, bring edit pages 'closer' to what we want