More NS integration (return-to-menu almost working)