bug fixes
Merge pull request #56 from ngoel36/watch_page

bug fixes