cleaner vid upload
fix merge conflicts
form class added