fix menu highlighting
Merge branch 'dev' of github.com:eugenpoyarkov/site-remote into dev