fix merge conflicts
Change width of input box
Links jump to correct time.
Fix css and position of sidebar to video parent container.