Last fixes for NDB_Menu