cleaned code and fixed sorting of new menu items added