Improve photo chooser