Fixe JS problems and menu labels