Some JS enhancements (highlighting & shortcut)