Merge pull request #4 from abhidbydx/cr_work

Cr work
remove duplicate include
Layout changes