Image picker improvements