added video and pieces pages
fixed merge conflicts