Move some elements to partials