added some css
fixed conflicts