Cleaning code
Issues #12 #18: Fixing bugs on video controls