Refactoring and updated Picasso lib