Changed design and added code to support videos