Menu link wizard bugfix and comments