Rejig of menu code