Totara Street safety improvements

* indicates required