Only prompt for photos, further video improvements

Supports #245