CSS Conflict Fixed