Reports changes

This changes include the following stories
https://www.pivotaltracker.com/story/show/68522670
https://www.pivotaltracker.com/story/show/68607174