Add categories, fix waypoints dialog