conflicting css issue fixes