fixed the way points to work nicely and moved the icons to a nice place