Dima/menu

adjusted menu & ordered to shortcuts