Silly-proofing new submenu and extra JS fixes.