wip: Updating partials to work with Long Form Admin view

@kitanata  This isn't done yet, but I would like to get these changes merged to avoid heavy conflicts later.