Fixed a navigation issue, editing an existing hazard was not possible.
Merge branch 'controls' into develop