adjusted menu & ordered to shortcuts