* Added Video Option
* Minor Fixes