Huge rework of menus, basis for modularity