Updated with recpect to new main menu