modified some menu items, and re-wrote them