List view improved two text displays and an image
Merge remote-tracking branch 'origin/master'