Update
Fixed merge
Fixed merge, again
Cleaned up video controls