rework menu structures again