The Measure Tool has gotten even better than before with some new functionality and usability improvements. You can now arrange your measures so they are located in a Geo-Set thus allowing you to place them in logical places in the tree. 

https://www.youtube.com/watch?v=YXoankcCWIw