Making safety pretty

Making safety pretty