Pks/menufixes

Menu reorganization