Initial new design push
Added actual values into the templates
Merge pull request #17 from r3bhatta/master

Design and chart changes