Videos rendering refactoring completed