Some quick changes in the menu structure, added delete option in the menu.