Merge pull request #73 from amittbhardwj/dirty

Modified Views and Templates