First part of implementation of new menus