[Final push before refactor] Edited partials.