Updated styling
fixed conflicts