Make templates a tad easier to theme

Generic content wrapper class - makes it so themes only have to define wrappers once.  Could (and probably should) be added to more places, these few are the most important.