first pass on 159
finished up 159 (fixes #159)
fix indentation
Merge branch '159-redo-reporting-ui' into devel