Move some content to partials
Moving stuff around