More editing of MenuFactory. Close to finishing