Merge pull request #2 from Somsubhra/master

Fix templates
edit views
add files
correcting content