Refactor and hack for Watch pages

The /watch?v=* pages required a setTimeout hack to wait for the sidebar
content to load before showing it.