Class & Style Accumulation Fixes