fixed css conflicting styles