moved some messy html into partials