Move around the partials to where they actually should be