Refactor minor issues.
Fix null pointer exception for video controls.