styling and javascript
fixed conflicts