Fix
Update overall design
Merge branch 'master' of github.com:ppballcatcher/report