cleaned up css a little
Added more options to hazard form
Merge branch 'dev'