WTacks (new) is a utility that allows for the editing of GPX Files and Tracks.  The newer version offers a larger number of mapping layers such as Open Street Maps (OSM) and several other features.