Fix invalid drawer
Revert waypoints dialog (due to crashes) and fix configure map/screen