Cleaning up code and adding a video icon overlay.