Minor refactoring
Adding waypoints by CTRL + click; icons added
Few minor changes