Added waypoint level
Improved background colors
Merge remote-tracking branch 'origin/master'