Shortcuts improvements