After having used a number of flight planning programs over the years, I would like to suggest moving Custom Waypoints from the main "Menu" to the "Flight Plan" menu. Custom waypoint creation and editing seems much more related to flight planning than any of the items under the "Menu" selection.