unified menu wip and some reorganization for it