Changed control scheme to avoid ambiguities with shortcuts