updates to styles
fixed conflicts