Adapted to new menu

@mkurek @kula1922 please review