edit page and partials, refactored