+ Image Picker
+ Performance Fixes
+ Cleanup