Added picture to the form and the listing page
Merged changes