fix several js and menu issues