changed more class names for cleaner look