moved content into partials