Update HTML to use div wrapper with common classes