Refactor partials and add a mostly reactive join