Video entry form improvement

Fixes some issues with the video entry forms, closes issue #48