fixing custommenu and js
merge
revert