styling adjustments
fixed conflicts