Back Button Needed

If I am looking at the track screen, I can select a waypoint to view.  From the waypoint screen there is a back button to go back to the track screen.  If I select 'show on map', I get to the map, but if I now want to go back and look at another waypoint of the same track, I have to go to 'saved' which gets me to the view of the waypoint i was looking at.  Having to click 'saved' to get back to the waypoint screen is counter-intuitive.  However, then I can go back to track and select the next waypoint I want to look at. As I have said before, I think every screen should have a 'back' button