fixing styles and class names