changes in menu code, more conformity