Fixed merge issue

- removed menu.js and changed scripts inclusion