code changes to improve graph functionality, as per code reviews by brett. Bug of graph delay to be finished.
Merge branch 'sachin2' into sachin
Merge branch 'sachin' of github.com:bvds/LaitsV3 into sachin