Simpler Image picker + Other fixes