Added sample thumbnail to ListView buttons, refactored screen code
Merge remote-tracking branch 'origin/master'