Merge pull request #4 from VioletGrey/2-1-stable

Refactor report views as per https://app.asana.com/0/6567329105013/86797...