Added an New menu item and reorganized a bit.