Added more class-based styling