Removed video picker and re-worked the photo picker