Shortcuts rearranged