Improved styling capabilities (added surrounding class)