CSS Conflict Fixes