Adding Choose New button and other image manager improvements