Fix shortcuts
Minor improvements to javascript system