working on styles and javascript
fixed merge conflicts for styles