More Changes to stabilize the design
Merge branch 'master' of https://github.com/bychwa/Smart-Reporter