some styling and added video
fix merge conflicts
css
merge conflicts