Finished the modal and video and tips.
Finished the video links page and fixed the header links
Pull dev and resolve conflicts