Complete initial layout
add additional videos query
fix merge conflicts