nav-bar to mobile
fixing javascript
merging
changes