Updated menu to use new approach and remove jasny