Fix javascript
fff
remove swap
Fix menu hover, colors
Merge conflict