corrected conflicting css rules