Updated the following files to integrate the new design
Merge branch 'master' of https://github.com/jhon312020/satguru1