Great work, you inspired me to mess with the UI a bit.
For those of you who would like no waypoints on your map as well (You will still have markers for the locations, however waypoints will be gone.) There is a long group of edits I did to get there.
I uploaded these edits here...