Refactored sections in to partials